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

Conflicts:
	Trunk/Data/Team_Saves.xml