Updated Everything

UI stuff
Receiving stuff
Merge branch 'master' of https://github.com/randyh/TAPIC

Conflicts:
	TAPIC/TAPIC.xcodeproj/project.pbxproj