[Menu droite]
[merge conflicts]
Merge branch 'master' of https://github.com/lemfi/MID_android.git
merge
Merge branch 'master' of https://github.com/lemfi/MID_android.git

Conflicts:
	pjmaintenant/src/fr/pjdroidteam/pjmaintenant/MainActivity.java
	pjmaintenant/src/fr/pjdroidteam/pjmaintenant/enums/TopActivites.java