Merge branch 'oz-config-json' into develop

# Conflicts:
#	scripts/win_compile_example.cmd

10 files changed, 6 insertions, 3 deletions

diff --git a/example/config.json b/example/config.json
new file mode 100644
index 0000000..6483257
--- /dev/null
+++ b/example/config.json
@@ -0,0 +1,3 @@
+{
+    "galleryRoot": "out/"
+}
diff --git a/example/readme.md b/example/readme.md
index d5a7563..e455f03 100644
--- a/example/readme.md
+++ b/example/readme.md
@@ -8,7 +8,8 @@ Content
 -------
 
 ```
-./example
+./example/out                -- the output directory for the compiled version of the gallery
+./example/src                -- source directory with pictures, configuration, tags and metadata
 ├── _DSC8808-1.jpg           -- a picture
 ├── _DSC8808-1.jpg.yaml      -- its associated sidecar metadata file
 ├── Glacier 3000             -- a directory grouping gallery items
@@ -17,6 +18,5 @@ Content
 │   ├── _DSC5475.jpg.yaml
 │   ├── _DSC5542.jpg
 │   └── _DSC5542.jpg.yaml
-├── gallery.yaml             -- gallery settings file
-└── readme.md                -- this README
+└── gallery.yaml             -- gallery settings file
 ```
diff --git a/example/Glacier 3000/_DSC5475.jpg b/example/src/Glacier 3000/_DSC5475.jpg
index 9835447..9835447 100644
--- a/example/Glacier 3000/_DSC5475.jpg
+++ b/example/src/Glacier 3000/_DSC5475.jpg
diff --git a/example/Glacier 3000/_DSC5475.jpg.yaml b/example/src/Glacier 3000/_DSC5475.jpg.yaml
index 3454a68..3454a68 100644
--- a/example/Glacier 3000/_DSC5475.jpg.yaml
+++ b/example/src/Glacier 3000/_DSC5475.jpg.yaml
diff --git a/example/Glacier 3000/_DSC5542.jpg b/example/src/Glacier 3000/_DSC5542.jpg
index 19a716e..19a716e 100644
--- a/example/Glacier 3000/_DSC5542.jpg
+++ b/example/src/Glacier 3000/_DSC5542.jpg
diff --git a/example/Glacier 3000/_DSC5542.jpg.yaml b/example/src/Glacier 3000/_DSC5542.jpg.yaml
index d174911..d174911 100644
--- a/example/Glacier 3000/_DSC5542.jpg.yaml
+++ b/example/src/Glacier 3000/_DSC5542.jpg.yaml
diff --git a/example/Glacier 3000/thumbnail.jpg b/example/src/Glacier 3000/thumbnail.jpg
index 19a716e..19a716e 100644
--- a/example/Glacier 3000/thumbnail.jpg
+++ b/example/src/Glacier 3000/thumbnail.jpg
diff --git a/example/_DSC8808-1.jpg b/example/src/_DSC8808-1.jpg
index 51b43b0..51b43b0 100644
--- a/example/_DSC8808-1.jpg
+++ b/example/src/_DSC8808-1.jpg
diff --git a/example/_DSC8808-1.jpg.yaml b/example/src/_DSC8808-1.jpg.yaml
index b946ff7..b946ff7 100644
--- a/example/_DSC8808-1.jpg.yaml
+++ b/example/src/_DSC8808-1.jpg.yaml
diff --git a/example/gallery.yaml b/example/src/gallery.yaml
index ea23d8a..ea23d8a 100644
--- a/example/gallery.yaml
+++ b/example/src/gallery.yaml