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

Conflicts:
	res/layout/userlogin.xml