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

Conflicts:
	bin/AndroidManifest.xml
	bin/classes/com/example/bab/MainActivity.class
	src/com/example/bab/MainActivity.java