Merge branch 'master' of https://github.com/2eviers/Assets

Conflicts:
	Scripts/Game/GameManager.cs