Merge branch 'refs/heads/NINJAmaster' into TimelineUber

Conflicts:
	js/components/layout/bread-crumb.reel/bread-crumb.js

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 24 insertions, 0 deletions

diff --git a/js/document/models/html.js b/js/document/models/html.js
new file mode 100755
index 00000000..ff57454b
--- /dev/null
+++ b/js/document/models/html.js
@@ -0,0 +1,24 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+////////////////////////////////////////////////////////////////////////
+//
+var Montage =                   require("montage/core/core").Montage,
+    BaseDocumentModel = require("js/document/models/base").BaseDocumentModel;
+////////////////////////////////////////////////////////////////////////
+//      
+exports.HtmlDocumentModel = Montage.create(BaseDocumentModel, {
+        ////////////////////////////////////////////////////////////////////
+        //
+        hasTemplate: {
+                enumerable: false,
+        value: false
+    }
+        ////////////////////////////////////////////////////////////////////
+        ////////////////////////////////////////////////////////////////////
+});
+////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////
\ No newline at end of file