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

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	ic_launcher-web.png
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png