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

2 files changed, 3 insertions, 2 deletions

diff --git a/node_modules/montage/ui/loading.reel/loading.html b/node_modules/montage/ui/loading.reel/loading.html
index 3d19b4cc..00d3cab4 100755
--- a/node_modules/montage/ui/loading.reel/loading.html
+++ b/node_modules/montage/ui/loading.reel/loading.html
@@ -11,7 +11,7 @@
     <script type="text/montage-serialization">
 {
     "owner": {
-        "prototype": "montage/ui/loading.reel",
+        "prototype": "ui/loading.reel",
         "properties": {
             "element": {
                 "#": "loading"
diff --git a/node_modules/montage/ui/loading.reel/loading.js b/node_modules/montage/ui/loading.reel/loading.js
index f0574d72..7ad180da 100755
--- a/node_modules/montage/ui/loading.reel/loading.js
+++ b/node_modules/montage/ui/loading.reel/loading.js
@@ -37,7 +37,8 @@ var Loading = exports.Loading = Montage.create(Component,/** @lends module:"mont
                 this._loading = isloading;
                 this.needsDraw = true;
             }
-        }
+        },
+        serializable: true
     },
 /**
     Description TODO