Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch

Conflicts:
	js/components/layout/tools-list.reel/tools-list.html
	js/components/layout/tools-properties.reel/tools-properties.html
	js/components/tools-properties/brush-properties.reel/brush-properties.html
	js/components/tools-properties/fill-properties.reel/fill-properties.html
	js/components/tools-properties/pen-properties.reel/pen-properties.html
	js/components/tools-properties/pencil-properties.reel/pencil-properties.html
	js/components/tools-properties/selection-properties.reel/selection-properties.html
	js/components/tools-properties/shape-properties.reel/shape-properties.html
	js/components/tools-properties/tag-properties.reel/tag-properties.html
	js/components/tools-properties/text-properties.reel/text-properties.html

1 files changed, 0 insertions, 1 deletions

diff --git a/imports/codemirror/mode/xmlpure/index.html b/imports/codemirror/mode/xmlpure/index.html
index 721834ac..0fdac7e5 100644
--- a/imports/codemirror/mode/xmlpure/index.html
+++ b/imports/codemirror/mode/xmlpure/index.html
@@ -54,6 +54,5 @@ and we're inside a comment! -->
     <p><b>@date</b>: August, 2011<br/> 
     <p><b>@github</b>: <a href='https://github.com/deebugger/CodeMirror2' target='blank'>https://github.com/deebugger/CodeMirror2</a></p>
 
-    <p><strong>MIME types defined:</strong> <code>application/xml</code>, <code>text/xml</code>.</p>
   </body>
 </html>