as
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014
modif turnmanager
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/57/57ea995bd4c4aa142a586030ad0b2e89