Merge branch 'refs/heads/master' into dom-architecture

Conflicts:
	js/document/templates/montage-html/package.json
	js/io/system/ninjalibrary.json
	node_modules/descriptor.json

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 0 insertions, 14 deletions

diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js b/js/components/tools-properties/subselection-properties.reel/subselection-properties.js
deleted file mode 100755
index bcd13642..00000000
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/* <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;
-var Component = require("montage/ui/component").Component;
-var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
-
-exports.SubSelectionProperties = Montage.create(ToolProperties, {
-
-
-});
\ No newline at end of file