update 9/20 9 PM
Merge branch 'master' of https://github.com/UG-Proto/uGather-iPhone

Conflicts:
	uGather/uGather/UGCreateMeeting.xib
	uGather/uGather/UGViewController.h
	uGather/uGather/UGViewController.m