Victor Woeltjen 3c3dd0ad17 Merge branch 'open1035' into open-master
Merge WTD-1035; resolving conflicts to avoid WTD-1069

Conflicts:
	platform/commonUI/edit/src/controllers/EditController.js
	platform/commonUI/edit/src/objects/EditableDomainObjectCache.js
2015-04-06 08:32:54 -07:00
..