dodge
dodge
Merge branch 'master' into scrum

Conflicts:
	Unity/Assets/Scripts/Settings/GameSettings.cs