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

Conflicts:
	res/layout/activity_wo.xml
	src/seahome/data/service/HttpService.java