Fixed some UI colors
Merge branch 'master' of https://github.com/iancheng/PunchQuest

Conflicts:
	PunchQuestApp/PunchQuestApp/AppDelegate.m