WIP
Merge branch 'master' into sghiassy/adding_locations

Conflicts:
	.gitignore
	H3AT.xcodeproj/project.pbxproj
POST to StackMob, working
Installed app to iPhone Device