bug fixes
Merge branch 'master' of https://github.com/cheewee2000/DaysOfStranger

Conflicts:
	TIA/CWTAppDelegate.m