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

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