update
erge branch 'master' of github.com:momoplan/seahome

Conflicts:
	src/seahome/activity/person/PersonCenterActivity.java