Merge branch 'master' into components

Conflicts:
	node_modules/montage/ui/bluemoon/progress.reel/progress.html
	node_modules/montage/ui/image2.reel/image2.html
	node_modules/ninja-components/effect/desaturate-effect.js
	node_modules/ninja-components/effect/effect.js
	node_modules/ninja-components/effect/invert-effect.js
	node_modules/ninja-components/effect/kaliedoscope-effect.js
	node_modules/ninja-components/effect/multiply-effect.js
	node_modules/ninja-components/effect/sepia-effect.js
	node_modules/ninja-components/flow-controller.reel/flow-controller.html
	node_modules/ninja-components/flow-controller.reel/flow-controller.js
	node_modules/ninja-components/flow-offset.js
	node_modules/ninja-components/hottext.reel/hottext.css
	node_modules/ninja-components/hottext.reel/hottext.html
	node_modules/ninja-components/hottext.reel/hottext.js
	node_modules/ninja-components/hottextunit.reel/hottextunit.css
	node_modules/ninja-components/hottextunit.reel/hottextunit.html
	node_modules/ninja-components/hottextunit.reel/hottextunit.js
	node_modules/ninja-components/image2.reel/image2.html
	node_modules/ninja-components/image2.reel/image2.js
	node_modules/ninja-components/image3d.reel/image3d.html
	node_modules/ninja-components/image3d.reel/image3d.js
	node_modules/ninja-components/photo-editor.reel/photo-editor.css
	node_modules/ninja-components/photo-editor.reel/photo-editor.html
	node_modules/ninja-components/photo-editor.reel/photo-editor.js
	node_modules/ninja-components/slider-base.js
	user-document-templates/montage-application-cloud/appdelegate.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

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"
     }