qsd
Merge branch 'master' of https://github.com/lemfi/PJMaintenant
[DEV] ecran menu gauche
[DEV] gestion top activite
Gestion menu parametre
Gestion conflit
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/drawer_list_item.xml
	src/fr/pjdroidteam/pjmaintenant/activites/carte/CarteActivity.java
	src/fr/pjdroidteam/pjmaintenant/activites/preferences/ActivityPreferenceAdapter.java
	src/fr/pjdroidteam/pjmaintenant/activites/preferences/ColorPickerAdapter.java