Affichage nom client
Merge branch 'master' of https://github.com/thibautpalier/JollyJumper

Conflicts:
	src/AndroidManifest.xml
Resolve Conflict