Major refactoring to prepare for multiple layers
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Character Scripts/Player.cs