18 files changed, 217 insertions, 183 deletions

diff --git a/js/clipboard/external-apps-clipboard-agent.js b/js/clipboard/external-apps-clipboard-agent.js
index 65410543..b82784d3 100644
--- a/js/clipboard/external-apps-clipboard-agent.js
+++ b/js/clipboard/external-apps-clipboard-agent.js
@@ -148,16 +148,12 @@ var ExternalAppsClipboardAgent = exports.ExternalAppsClipboardAgent = Montage.cr
             data = htmlData ? htmlData : textData;
 
             if (data && data.length) {
-                //deselect current selections
-                this.application.ninja.selectedElements.length = 0;
-                NJevent("selectionChange", {"elements": this.application.ninja.selectedElements, "isDocument": true} );
-
                 divWrapper = document.application.njUtils.make("div", null, this.application.ninja.currentDocument);
                 this.application.ninja.elementMediator.addElements(divWrapper, {"height": "68px",
                                                                                 "left": "0px",
                                                                                 "position": "absolute",
                                                                                 "top": "0px",
-                                                                                "width": "161px"}, false);
+                                                                                "width": "161px"}, false/*notify*/, false/*callAddDelegate*/);
 
                 divWrapper.innerHTML = data;
 
diff --git a/js/controllers/clipboard-controller.js b/js/controllers/clipboard-controller.js
index c3543c95..3eba1bec 100644
--- a/js/controllers/clipboard-controller.js
+++ b/js/controllers/clipboard-controller.js
@@ -82,16 +82,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused except the copy menu button
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.copy(clipboardEvent);
             }
@@ -106,16 +101,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             if(this.clipboardContext === "stage"){
                 ElementsClipboardAgent.cut(clipboardEvent);
             }
@@ -137,16 +127,11 @@ var ClipboardController = exports.ClipboardController = Montage.create(Component
 
             // Don't do anything if an input or other control is focused
             if(document.activeElement.nodeName !== "BODY") {
-                if(!document.activeElement.getAttribute("data-montage-id") === "menuItemButton") {
+                if(!(document.activeElement.getAttribute("data-montage-id") === "menuItemButton")) {
                     return;
                 }
             }
 
-            //perform clipboard operations only if selection tool is selected
-            if(this.application.ninja.toolsData.defaultToolsData[this.application.ninja.toolsData.selectionToolIndex].selected === false){
-                return;
-            }
-
             //TODO: return if stage is not focussed
 
             if(this.clipboardContext === "stage"){
diff --git a/js/io/system/ninjalibrary.json b/js/io/system/ninjalibrary.json
index bbf53144..6b74b04f 100644
--- a/js/io/system/ninjalibrary.json
+++ b/js/io/system/ninjalibrary.json
@@ -1,6 +1,6 @@
 {
         "libraries": [
                 {"name": "Montage", "path": "/node_modules/descriptor.json", "version": "0.11.2.1"},
-                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.4"}
+                {"name": "RDGE", "path": "/assets/descriptor.json", "version": "0.6.0.5"}
         ]
 }
\ No newline at end of file
diff --git a/js/lib/geom/geom-obj.js b/js/lib/geom/geom-obj.js
index dd60cdec..7b4e49fa 100755
--- a/js/lib/geom/geom-obj.js
+++ b/js/lib/geom/geom-obj.js
@@ -405,8 +405,8 @@ exports.GeomObj = Object.create(Object.prototype, {
                     case "plasma":
                     case "deform":
                     case "water":
-                    case "paris":
-                    case "raiders":
+                    case "blueSky":
+                    case "darkBlur":
                     case "tunnel":
                     case "reliefTunnel":
                     case "squareTunnel":
diff --git a/js/lib/rdge/materials/radial-blur-material.js b/js/lib/rdge/materials/radial-blur-material.js
index 1f89f79e..2d26638b 100644
--- a/js/lib/rdge/materials/radial-blur-material.js
+++ b/js/lib/rdge/materials/radial-blur-material.js
@@ -176,22 +176,22 @@ var radialBlurMaterialDef =
 };
 
 
-var RaidersMaterial = function RaidersMaterial() {
+var DarkBlurMaterial = function DarkBlurMaterial() {
     // initialize the inherited members
     this.inheritedFrom = RadialBlurMaterial;
     this.inheritedFrom();
 
-    this._name = "Raiders";
-    this._shaderName = "raiders";
+    this._name = "Dark Blur";
+    this._shaderName = "darkBlur";
 
-    this._texMap = 'assets/images/raiders.png';
+    this._texMap = 'assets/images/darkblur.png';
     this._propValues[this._propNames[0]] = this._texMap.slice(0);
 
 
     // duplicate method required
     this.dup = function (world) {
         // allocate a new uber material
-        var newMat = new RaidersMaterial();
+        var newMat = new DarkBlurMaterial();
 
         // copy over the current values;
         var propNames = [], propValues = [], propTypes = [], propLabels = [];
@@ -204,10 +204,10 @@ var RaidersMaterial = function RaidersMaterial() {
     };
 }
 
-RaidersMaterial.prototype = new Material();
+DarkBlurMaterial.prototype = new Material();
 
 if (typeof exports === "object") {
-    exports.RaidersMaterial = RaidersMaterial;
+    exports.DarkBlurMaterial = DarkBlurMaterial;
 }
 
 
diff --git a/js/lib/rdge/materials/water-material.js b/js/lib/rdge/materials/water-material.js
index c7e7313c..9997244c 100644
--- a/js/lib/rdge/materials/water-material.js
+++ b/js/lib/rdge/materials/water-material.js
@@ -165,16 +165,16 @@ var waterMaterialDef =
     }
 };
 
-var ParisMaterial = function ParisMaterial()
+var BlueSkyMaterial = function BlueSkyMaterial()
 {
     // initialize the inherited members
     this.inheritedFrom = WaterMaterial;
     this.inheritedFrom();