Merge branch 'master' into persist-on-mutation-825

Conflicts: platform/core/src/capabilities/PersistenceCapability.js platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
2016-05-19 11:41:08 -07:00
parent f85ac79b4a 5b4952d4c6
commit d3f2a24267
817 changed files with 1867 additions and 4586 deletions
--- a/platform/entanglement/src/services/LinkService.js
+++ b/platform/entanglement/src/services/LinkService.js
@@ -20,11 +20,9 @@
 * at runtime from the About dialog for additional information.
 *****************************************************************************/

-/*global define */

 define(
    function () {
-        "use strict";

        /**
         * LinkService provides an interface for linking objects to additional