-
Merge branch 'dev-syncmanager' into dev-SOA-2

Conflicts:
	v2/js/SyncManager.js