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, 11 insertions, 2 deletions

diff --git a/node_modules/montage/package.json b/node_modules/montage/package.json
index 299857f7..6cc0c079 100755
--- a/node_modules/montage/package.json
+++ b/node_modules/montage/package.json
@@ -2,14 +2,23 @@
     "name": "montage",
     "version": "0.3.1",
     "description": "A UI Framework",
-    "main": "core/core.js",
+    "main": "montage",
     "exclude": [
         "lab/benchmarks",
         "lab/sandbox",
         "examples",
         "require/test",
-        "require/tests"
+        "require/tests",
+        "etc"
     ],
+    "overlay": {
+        "montage": {
+            "main": "core/core"
+        }
+    },
+    "bin": {
+        "montage": "bin/montage"
+    },
     "devDependencies": {
         "test": ">=0.2.1"
     }