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

Conflicts:
	src/seahome/constants/Constants.java
	src/seahome/data/service/HttpService.java
update
Merge branch 'master' of github.com:momoplan/seahome

Conflicts:
	src/seahome/constants/Constants.java
	src/seahome/service/net/HttpUrlConnPost.java