Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

57 files changed, 2220 insertions, 1910 deletions

diff --git a/js/components/layout/tools-list.reel/tools-list.html b/js/components/layout/tools-list.reel/tools-list.html
index 9aa05e5d..d5c33624 100755
--- a/js/components/layout/tools-list.reel/tools-list.html
+++ b/js/components/layout/tools-list.reel/tools-list.html
@@ -55,9 +55,6 @@
             "SelectionTool1": {
                 "prototype": "js/tools/SelectionTool"
             },
-            "SubselectionTool1": {
-                "prototype": "js/tools/SubSelectTool"
-            },
             "Rotate3DTool1": {
                 "prototype": "js/tools/RotateObject3DTool"
             },
@@ -85,9 +82,6 @@
             "LineTool1": {
                 "prototype": "js/tools/LineTool"
             },
-            "PencilTool1": {
-                "prototype": "js/tools/PencilTool"
-            },
             "BrushTool1": {
                 "prototype": "js/tools/BrushTool"
             },
@@ -97,9 +91,6 @@
             "InkBottleTool1": {
                 "prototype": "js/tools/InkBottleTool"
             },
-            "EyedropperTool1": {
-                "prototype": "js/tools/EyedropperTool"
-            },
             "EraserTool1": {
                 "prototype": "js/tools/EraserTool"
             },
@@ -132,7 +123,6 @@
                 "properties": {
                     "element": {"#": "toolsList"},
                     "SelectionTool":          {"@": "SelectionTool1"},
-                    "SubselectionTool":       {"@": "SubselectionTool1"},
                     "Rotate3DTool":           {"@": "Rotate3DTool1"},
                     "Translate3DTool":        {"@": "Translate3DTool1"},
                     "TagTool":                {"@": "TagTool1"},
@@ -142,11 +132,9 @@
                     "OvalTool":               {"@": "OvalTool1"},
                     "RectTool":               {"@": "RectTool1"},
                     "LineTool":               {"@": "LineTool1"},
-                    "PencilTool":             {"@": "PencilTool1"},
                     "BrushTool":              {"@": "BrushTool1"},
                     "FillTool":               {"@": "FillTool1"},
                     "InkBottleTool":          {"@": "InkBottleTool1"},
-                    "EyedropperTool":         {"@": "EyedropperTool1"},
                     "EraserTool":             {"@": "EraserTool1"},
                     "RotateStageTool3D":      {"@": "RotateStageTool3D1"},
                     "PanTool":                {"@": "PanTool1"},
@@ -169,8 +157,6 @@
                     <hr />
                 </div>
             </div>
-            <!-- TODO: Remove and add as a component -->
-            <div id="colortoolbar"></div>
             <div data-montage-id="disabledCondition" class="panelDisabled"></div>
         </div>
 
diff --git a/js/components/layout/tools-list.reel/tools-list.js b/js/components/layout/tools-list.reel/tools-list.js
index d68e8a56..a10b6c3e 100755
--- a/js/components/layout/tools-list.reel/tools-list.js
+++ b/js/components/layout/tools-list.reel/tools-list.js
@@ -10,7 +10,6 @@ var Component = require("montage/ui/component").Component;
 exports.ToolsList = Montage.create(Component, {
 
     SelectionTool:          { value: null },
-    SubselectionTool:       { value: null },
     Rotate3DTool:           { value: null },
     Translate3DTool:        { value: null },
     TagTool:                { value: null },
@@ -20,11 +19,9 @@ exports.ToolsList = Montage.create(Component, {
     OvalTool:               { value: null },
     RectTool:               { value: null },
     LineTool:               { value: null },
-    PencilTool:             { value: null },
     BrushTool:              { value: null },
     FillTool:               { value: null },
     InkBottleTool:          { value: null },
-    EyedropperTool:         { value: null },
     EraserTool:             { value: null },
     RotateStageTool3D:      { value: null },
     PanTool:                { value: null },
@@ -53,7 +50,6 @@ exports.ToolsList = Montage.create(Component, {