zoom fixes +camera stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	New Unity Project/Assets/Scene-1-1-1.unity