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, 4 insertions, 4 deletions

diff --git a/node_modules/montage/ui/tabs.reel/tabs.html b/node_modules/montage/ui/tabs.reel/tabs.html
index ad51e254..adb7c9a5 100755
--- a/node_modules/montage/ui/tabs.reel/tabs.html
+++ b/node_modules/montage/ui/tabs.reel/tabs.html
@@ -25,19 +25,19 @@
             }
         }
     },
-    
+
     "repetition1": {
         "module": "montage/ui/repetition.reel",
         "name": "Repetition",
         "properties": {
             "element": {
-                "#": "tab-list"                
+                "#": "tab-list"
             },
             "isSelectionEnabled": true,
             "contentController": {"@": "navController"}
         }
     },
-    
+
     "owner": {
         "module": "montage/ui/tabs.reel",
         "name": "Tabs",
@@ -72,7 +72,7 @@
     <div id='tabs-nav' class='montage-tabs montage-container'>
         <div id="montage-tabs-indicator" class="montage-tabs-indicator" style="display: none;"></div>
         <ul id="tab-list" class='montage-tabs-list montage-clearfix'>
-            <li></li> 
+            <li></li>
         </ul>
     </div>