Amélioration de l'affichage des conversations et des messages
Merge branch 'master' of https://github.com/edimitchel/AL_SMS

Conflicts:
	src/com/cnam/al_sms/Esclave_Activities/MainActivity.java