Merge branch 'master' into pentool

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

1 files changed, 0 insertions, 7 deletions

diff --git a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css b/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css
deleted file mode 100755
index 39484e8d..00000000
--- a/node_modules/montage/lab/sandbox/ui/picasa-carousel-test/main.reel/main.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.montage-google-picasa-carousel, [data-montage-id="montage-google-picasa-carousel"] {
-        height: 300px;
-    -webkit-perspective: 800px;
-    background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#bbb));
-}
-
-