Victor Woeltjen f27e4d6e06 Merge branch 'open-master' into open1482c ...

Merge in latest in preparation to merge; WTD-1482

Conflicts:
	platform/commonUI/browse/src/creation/CreationService.js
	platform/core/src/models/RootModelProvider.js
	platform/entanglement/src/services/LinkService.js
	platform/entanglement/src/services/MoveService.js

2015-08-19 15:00:52 -07:00

..

actions

[Code Style] Use prototypes in entanglement bundle

2015-08-11 14:58:31 -07:00

capabilities

[Location] can retrieve contextual location

2015-08-19 11:33:45 -07:00

services

[Move] correct logic and specification

2015-08-19 13:16:36 -07:00

ControlledPromise.js

[Test] add a synchronous controlled promise for testing

2015-08-06 14:53:59 -07:00

DomainObjectFactory.js

[Licenses] Add License Headers

2015-06-11 14:22:18 -07:00

suite.json

Merge branch 'open-master' into open1482c

2015-08-19 15:00:52 -07:00