Turnmanager v2
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Temp/UnityTempFile-0f52a699cfca06d4db522e8bd1c175e2
	Project/Temp/UnityTempFile-688fe47d16e8054438228a555f6a661e
	Project/Temp/UnityTempFile-b6b56ec92af46c64a9b189fb9cabc603
	Project/Temp/__EditModeScene