Merge branch 'master' into brushtool

Conflicts:
	js/controllers/elements/shapes-controller.js

1 files changed, 4 insertions, 0 deletions

diff --git a/assets/descriptor.json b/assets/descriptor.json
index af0520dd..85fbc996 100644
--- a/assets/descriptor.json
+++ b/assets/descriptor.json
@@ -21,6 +21,9 @@
                 "images/cubelight.png",
                 "images/random_normal.png",
                 "images/white.png",
+        "images/paris.png",
+        "images/powderblue.png",
+        "images/raiders.png",
                 "shaders/Basic.frag.glsl",
                 "shaders/TwistVert.vert.glsl",
                 "shaders/Basic.vert.glsl",
@@ -36,6 +39,7 @@
                 "shaders/Keleidoscope.frag.glsl",
                 "shaders/plasma.frag.glsl",
                 "shaders/Mandel.frag.glsl",
+        "shaders/Paris.frag.glsl",
                 "shaders/plasma.vert.glsl",
                 "shaders/Pulse.frag.glsl",
                 "shaders/radialBlur.frag.glsl",