Merge remote-tracking branch 'ninja-internal/master' into test-merge

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
	js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js

1 files changed, 1 insertions, 1 deletions

diff --git a/js/components/treeview/treeview.reel/treeview.html b/js/components/treeview/treeview.reel/treeview.html
index 1bed0f0b..9ab575c6 100644
--- a/js/components/treeview/treeview.reel/treeview.html
+++ b/js/components/treeview/treeview.reel/treeview.html
@@ -27,7 +27,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
                 "prototype" : "js/components/treeview/leaf.reel"                
             },
             "scrollview": {
-                "prototype": "montage/ui/scrollview.reel[Scrollview]",
+                "prototype": "montage/ui/scroller.reel",
                 "properties": {
                     "element": {"#": "treeView"},
                     "axis": "vertical"