Réglage ultime
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/CurrentLayout.dwlt
	Project/Library/CurrentMaximizeLayout.dwlt
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-122c3990123a6b040ab0368c5c279f99
	Project/Temp/UnityTempFile-239319cd6c15aeb458a277d787c961d6
	Project/Temp/UnityTempFile-24752c018223c9a40a112ceedeccb568
	Project/Temp/UnityTempFile-32b69880d14939a4c8265f398cb94de4