Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/MaterialsLibrary.js

2 files changed, 8 insertions, 1 deletions

diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index aacb228c..ede71383 100644
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -122,7 +122,7 @@ exports.DragDropMediator = Montage.create(Component, {
 
                     NJUtils.makeElementModel(domElem, "SVG", "block");
                 } else { // treat as a regular image
-                    domElem = NJUtils.makeNJElement("image", "Image", "block");
+                    domElem = NJUtils.makeNJElement("image", "image", "image");
                     domElem.src = evt2.currentTarget.result;
                 }
 
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index c44e1cb5..9aefbca6 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -112,6 +112,13 @@ exports.ElementMediator = Montage.create(NJComponent, {
         }
     },
 
+    replaceElement: {
+        value: function(el, el2) {
+            el2.elementModel = el.elementModel;
+            this.application.ninja.currentDocument.documentRoot.replaceChild(el2, el);
+        }
+    },
+
     getNJProperty: {
         value: function(el, p) {
             if(el.elementModel) {