tt
Merge branch 'master' of https://github.com/ffcspub/618
Merge branch 'master' of https://github.com/ffcspub/618

Conflicts:
	618/618/AppDelegate.m