made a soft resync
performance and alternative camera
Merge branch 'robin'

Conflicts:
	ProjectSettings/EditorBuildSettings.asset