Merge branch 'refs/heads/NinjaInternal' into Color

Conflicts:
	js/controllers/elements/shapes-controller.js
	js/data/pi/pi-data.js
	js/panels/properties/content.reel/content.js

1 files changed, 0 insertions, 17 deletions

diff --git a/node_modules/montage/effect/kaliedoscope-effect.js b/node_modules/montage/effect/kaliedoscope-effect.js
deleted file mode 100755
index 38462602..00000000
--- a/node_modules/montage/effect/kaliedoscope-effect.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/* <copyright>
- This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
- No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
- (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
- </copyright> */
-var Montage = require("montage").Montage;
-var Effect = require("effect/effect").Effect;
-
-exports.KaliedoscopeEffect = Montage.create(Effect, {
-
-    applyEffect: {
-        value: function() {
-            console.log("kaliedoscope")
-        }
-    }
-
-});