Merge branch 'develop' into feature-multiresources

Conflicts:
	Resources/Kethane.cfg