testing new mechanics
Merge branch 'master' of https://github.com/timmyterrezza/EGDP2

Conflicts:
	Game/Assembly-CSharp-vs.csproj
	Game/Assembly-CSharp.csproj
	Game/Game-csharp.sln
	Game/Game.sln
	Game/Game.userprefs
	Game/ProjectSettings/TagManager.asset