Ajout de la liste des conversations
Merge branch 'master' of https://github.com/edimitchel/AL_SMS

Conflicts:
	res/layout/activity_main.xml
	res/layout/fragment_main.xml