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

Conflicts:
	src/seahome/activity/guide/StartActivity.java
	src/seahome/activity/regist/RegistThreeActivity.java
	src/seahome/activity/regist/RegistTwoActivity.java