Conflits
Merge branch 'master' of https://github.com/Domethic/MeData

Conflicts:
	AndroidManifest.xml
Staff Profile - Action Bar & Changements graphiques
Merge branch 'master' of https://github.com/Domethic/MeData