Code is now commented
Merge remote-tracking branch 'origin/Maxime'

Conflicts:
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll
	StratBrawl_source/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	StratBrawl_source/Library/assetDatabase3
	StratBrawl_source/Library/guidmapper
	StratBrawl_source/Library/metadata/49/49f3a6f77176f334f9c12822f839e494
	StratBrawl_source/Library/metadata/8c/8ce6e7db926c244c09cf3725dcadec05
	StratBrawl_source/Library/metadata/8f/8fc654023162a974eb4e44aa5a01a372
	StratBrawl_source/Library/metadata/93/93a6dd24433069741b633676deebd3f5
	StratBrawl_source/Library/metadata/95/95899e49d61c04b80afc5bd3e85811ec
	StratBrawl_source/Library/metadata/9a/9a1fc767a03f79a4a8c7a6228c6b09e4
	StratBrawl_source/Library/metadata/bd/bd6d0bd942da50c45b12dea2b6128ca8
	StratBrawl_source/StratBrawl_source-csharp.sln
	StratBrawl_source/StratBrawl_source.sln