Merge remote-tracking branch 'origin/dev-SOA-2' into dev-syncmanager

Conflicts:
	v2/js/SyncManager.js
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2