Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

1 files changed, 0 insertions, 10 deletions

diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json
deleted file mode 100755
index 4dcc16c6..00000000
--- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "name": "loader",
-    "version": "0.0.0",
-    "mappings": {
-    "montage": "../../../../"
-    },
-    "directories": {
-        "lib": ""
-    }
-}