Merge Fix

Because of COURSE...
Merge branch 'master' of https://github.com/alexupton/Titans1

Conflicts:
	Titans/TitansContent/TitansContent.contentproj