bin manisfst
Merge branch 'master' of https://github.com/mathildegui/bab

Conflicts:
	bin/AndroidManifest.xml
	bin/bab.apk
	bin/classes.dex
	bin/resources.ap_