modify
Merge branch 'master' of github.com:momoplan/seahome
modify
Merge branch 'master' of github.com:momoplan/seahome

Conflicts:
	src/seahome/activity/business/BusinessDetailActivity.java