update
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	res/layout/activity_circle_cream.xml
	res/layout/activity_circle_friend_detail.xml
	res/layout/activity_circle_friend_status.xml
	res/layout/activity_user.xml
	res/layout/activity_wo.xml