Cleanup stuff
Merge branch 'master' of https://github.com/OtspIII/Autoheroic

Conflicts:
	Build/Autoheroic_Data/Managed/Assembly-CSharp-firstpass.dll
	Build/Autoheroic_Data/Managed/Assembly-CSharp.dll
	Build/Autoheroic_Data/PlayerConnectionConfigFile
	Build/Autoheroic_Data/mainData
	Build/Autoheroic_Data/output_log.txt
	Build/Autoheroic_Data/resources.assets
	Build/Autoheroic_Data/sharedassets0.assets