[Action] Merge

Merged with master.
2015-08-26 10:11:23 -07:00
parent a507557cec 509badb225
commit e7563ff4e9
291 changed files with 12402 additions and 9327 deletions
--- a/platform/commonUI/edit/src/actions/RemoveAction.js
+++ b/platform/commonUI/edit/src/actions/RemoveAction.js
@@ -57,7 +57,6 @@ define(
                navigationService = this.navigationService,
                domainObject = this.domainObject,
                ROOT_ID = "ROOT";
-
            /*
             * Check whether an object ID matches the ID of the object being
             * removed (used to filter a parent's composition to handle the