Ajout menu Paramètres
Merge branch 'master' of https://github.com/lemfi/PJMaintenant.git

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/lemfi/PJMaintenant.git
Ajout des Préférences