clean
Merge branch 'Fred'

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/metadata/40/40b8058d7ba615141baabd9ee79e4282
	StratBrawl_source/Library/metadata/8f/8fc654023162a974eb4e44aa5a01a372
	StratBrawl_source/Library/metadata/93/93a6dd24433069741b633676deebd3f5
	StratBrawl_source/Library/metadata/9a/9a1fc767a03f79a4a8c7a6228c6b09e4
	StratBrawl_source/Library/metadata/bb/bb037a409c9f37d488f4696964ecbca3
	StratBrawl_source/StratBrawl_source-csharp.sln
	StratBrawl_source/StratBrawl_source.sln
	StratBrawl_source/StratBrawl_source.userprefs