Merge branch 'refs/heads/master' into binding

Conflicts:
	node_modules/montage/ui/application.js

Signed-off-by: Armen Kesablyan <armen@motorola.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/node_modules/montage/ui/scroller.reel/scroller.css b/node_modules/montage/ui/scroller.reel/scroller.css
new file mode 100644
index 00000000..0966ad8e
--- /dev/null
+++ b/node_modules/montage/ui/scroller.reel/scroller.css
@@ -0,0 +1,15 @@
+/* <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> */
+ 
+.montage-scroller {
+    position: relative;
+    display: block;
+    overflow: hidden;
+}
+.montage-scroller .content {
+    float: left;
+    width: 100%;
+}
\ No newline at end of file