Merge branch 'master' into pentool

Conflicts:
	js/tools/PenTool.js

1 files changed, 0 insertions, 8 deletions

diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js
index b5df3911..7af7e824 100755
--- a/js/controllers/elements/canvas-controller.js
+++ b/js/controllers/elements/canvas-controller.js
@@ -33,13 +33,5 @@ exports.CanvasController = Montage.create(ElementController, {
                     ElementController.setProperty(el, p, value);
             }
         }
-    },
-        
-   setProperties: {
-       value: function(el, props, index) {
-           for(var p in props) {
-               el.elementModel.controller.setProperty(el, p, props[p][index]);
-           }
-       }
     }
 });
\ No newline at end of file