[OE-3301] reconciliation
Merge branch 'demo/orbis' of github.com:openeyes/OpenEyes into demo/orbis

Conflicts:
	protected/controllers/SyncController.php