Torch now follows mouse
Merge remote-tracking branch 'origin/master'

Conflicts:
	Unity project/Assets/New Terrain.asset