BMA update
Merge branch 'BranchMa' into Anthony

Conflicts:
	The Project/Assets/Scenes/DangerRoom.unity
	The Project/The Project-csharp.sln
	The Project/The Project.sln
	The Project/The Project.userprefs