Huaemn WIP & camera fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Scripts/PlayerController.cs