Merge branch 'master' into pentool

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

1 files changed, 7 insertions, 0 deletions

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) {