merge
Merge branch 'master' of https://github.com/FLEDevgit/AndApp.git

Conflicts:
	AndApp/bin/AndroidManifest.xml
merge
Ajout thème noel