wizzard and manual search functions for families completed and ready for
testing
Merge branch 'test'

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