Signed-off-by: zhengjiabin <zhengjiabin.tj@gmail.com>
Merge branch 'master' of https://github.com/zhengjiabin/ToGather.git

Conflicts:
	src/cn/edu/tongji/sse/com/togather/android/activity/InviteActivity.java