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

Conflicts:
	AndroidManifest.xml
	src/seahome/activity/main/MainActivity.java