Message à propos de l'OpenSource
Merge branch 'android' of ssh://github.com/MappaM/grignouxcinema into android

Conflicts:
	AndroidManifest.xml
	bin/be.itstudents.tom.android.grignoux.apk