t
Merge branch 'master' of https://github.com/tral/homebuh_app.git

Conflicts:
	bin/classes.dex
	bin/homebuh_app.apk