Commit clean up
Merge branch 'master' of https://github.com/UG-Proto/uGather-iPhone

Conflicts:
	uGather/UGather iPhone.xcodeproj/project.pbxproj
	uGather/UGather
iPhone.xcodeproj/project.xcworkspace/xcshareddata/UGather
iPhone.xccheckout