Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into integration

Conflicts:
	js/helper-classes/RDGE/GLWorld.js
	js/helper-classes/RDGE/Materials/PulseMaterial.js
	js/helper-classes/RDGE/Materials/RadialBlurMaterial.js
	js/helper-classes/RDGE/src/tools/rdge-compiled.js
	js/preloader/Preloader.js

3 files changed, 231 insertions, 80 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 29bf6eb3..33145028 100755..100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -24,7 +24,10 @@
                         "trackRepetition" : {"@" : "repetition2"},
                         "playhead": {"#": "playhead"},
                         "playheadmarker": {"#": "playhead_marker"},
-                        "timetext" : {"#": "time_text"}
+                        "timetext" : {"#": "time_text"},
+                        "timebar" : {"#": "time_bar"},
+                        "container_tracks" : {"#" : "container-tracks"},
+                        "end_hottext" : {"@" : "endHottext"}
                     }
                 },
 
@@ -143,6 +146,36 @@
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.tweens",
                                         "oneway" : false
                                 },
+                        "animatedElement" : {
+                            "boundObject" : {"@" : "repetition2"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.animatedElement",
+                            "oneway" : false
+                        },
+                                "arrStyleTracks" : {
+                                        "boundObject" : {"@" : "repetition2"},
+                                        "boundObjectPropertyPath" : "objectAtCurrentIteration.arrStyleTracks",
+                                        "oneway" : false
+                                },
+                        "isTrackAnimated" : {
+                            "boundObject" : {"@" : "repetition2"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.isTrackAnimated",
+                            "oneway" : false
+                        },
+                        "trackDuration" : {
+                            "boundObject" : {"@" : "repetition2"},
+                                "boundObjectPropertyPath" : "objectAtCurrentIteration.trackDuration",
+                                "oneway" : false
+                        },
+                        "animationName" : {
+                            "boundObject" : {"@" : "repetition2"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.animationName",
+                            "oneway" : false
+                        },
+                        "currentKeyframeRule" : {
+                            "boundObject" : {"@" : "repetition2"},
+                                "boundObjectPropertyPath" : "objectAtCurrentIteration.currentKeyframeRule",
+                                "oneway" : false
+                        },
                                 "isMainCollapsed" : {
                                         "boundObject" : {"@" : "repetition2"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isMainCollapsed",
@@ -162,9 +195,26 @@
                                         "boundObject" : {"@" : "repetition2"},
                                         "boundObjectPropertyPath" : "objectAtCurrentIteration.isStyleCollapsed",
                                         "oneway" : false
-                                }
+                                },
+                        "trackPosition" : {
+                            "boundObject" : {"@" : "repetition2"},
+                            "boundObjectPropertyPath" : "objectAtCurrentIteration.trackPosition",
+                            "oneway" : false
+                        }
                         }
-                    }
+                    },
+                "endHottext" : {
+                    "module": "js/components/hottextunit.reel",
+                    "name": "HotTextUnit",
+                    "properties": {
+                        "element": {"#": "end_hottext"},
+                        "maxValue" : 100000,
+                        "minValue" : 1,
+                        "acceptableUnits" : "sec",
+                        "units" : "sec",
+                        "value" : 25
+                    }
+                }
             }
         </script>
 
@@ -193,7 +243,9 @@
 
                         
                         <div id="user_layers" class="userlayers">
-                            <div id="master_layer" class="masterlayer">Master Layer</div>
+                            <div id="master_layer" class="masterlayer">
+                                <div>Master Layer</div>
+                            </div>
                             <div id="container-layers">
                                 <div id="container-layer"></div>
                             </div>
@@ -202,6 +254,7 @@
                         <div id="timeline_gutter" class="timelinegutter">
                             <div id="newlayer_button" class="newlayerbutton"></div>
                             <div id="deletelayer_button" class="deletelayerbutton"></div>
+                            <input id="end_hottext" class="endhottext">
                         </div>
                     </div>
                 </div>
@@ -211,16 +264,17 @@
                 <div id="timeline_rightpane" class="tl_rightpane">
                     <div id="right_inside" class="rightinside">
                         <div class="layout_markers">
-                                <div id="timeline_markers" class="timelinemarkers">
-                                    <div id="playhead" class="playhead"></div>
-                                </div>
+                            <div id="playhead" class="playhead"></div>
+                                <div id="timeline_markers" class="timelinemarkers"></div>
                         </div>
 
 
                         <div id="layer_tracks" class="tl_layertracks">
                                 <div class="layout-tracks">
                                     <div id="playhead_marker" class="playheadmarker"></div>
-                                    <div id="master_track" class="mastertrack"></div>
+                                    <div id="master_track" class="mastertrack">
+                                    <div id="time_bar" class="timebar"></div>
+                                    </div>
                                     <div id="container-tracks" class="container-tracks">
                                         <div id="container-track"></div>
                                     </div>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 07fee19d..62ae625f 100755..100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -65,6 +65,22 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         value:1000
     },
 
+    _masterDuration:{
+        serializable: true,
+        value:0
+    },
+
+    masterDuration:{
+        serializable:true,
+        get:function(){
+            return this._masterDuration;
+        },
+        set:function(val){
+            this._masterDuration = val;
+            this.timebar.style.width = (this._masterDuration / 12) + "px";
+        }
+    },
+
     _arrTracks:{
         serializable:true,
         value:[]
@@ -109,6 +125,20 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    _selectedTweens:{
+        value:[]
+    },
+
+    selectedTweens:{
+        serializable:true,
+        get:function () {
+            return this._selectedTweens;
+        },
+        set:function (newVal) {
+            this._selectedTweens = newVal;
+        }
+    },
+
     _isLayer:{
         value:false
     },
@@ -118,21 +148,29 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         writable:true
     },