last chance
new stuff
Merge branch

Conflicts:
	bin/HomeStayManagerAndroidApp.apk
	bin/classes.dex
	bin/resources.ap_