Merge branch 'refs/heads/FileIO-jose' into FileIO

Conflicts:
	css/ninja.css
	js/controllers/document-controller.js

Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/js/document/text-document.js b/js/document/text-document.js
index 5c731bcf..1132ba65 100755
--- a/js/document/text-document.js
+++ b/js/document/text-document.js
@@ -6,9 +6,10 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 //BaseDocument Object for all files types and base class for HTML documents.
 
-var Montage = require("montage/core/core").Montage;
+var Montage =   require("montage/core/core").Montage,
+        Component = require("montage/ui/component").Component;
 
-var TextDocument = exports.TextDocument = Montage.create(Montage, {
+var TextDocument = exports.TextDocument = Montage.create(Component, {
         
         
         //TODO: Clean up, test