Du serieux
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/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/a6/a66588329bd417947b2657f07fd26192
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Project.userprefs