Merge branch 'refs/heads/NinjaInternal' into FileIO

Conflicts:
	js/controllers/document-controller.js

1 files changed, 15 insertions, 0 deletions

diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
new file mode 100644
index 00000000..1b0035cd
--- /dev/null
+++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.js
@@ -0,0 +1,15 @@
+var Montage = require("montage/core/core").Montage;
+var Component = require("montage/ui/component").Component;
+
+var PropertyTrack = exports.PropertyTrack = Montage.create(Component, {
+
+    hasTemplate:{
+        value: true
+    },
+
+    prepareForDraw:{
+        value:function(){
+
+        }
+    }
+});