Merge branch 'master' of https://github.com/edimitchel/AL_SMS

Conflicts:
	res/layout/activity_synchroniser.xml
Merge branch 'master' of https://github.com/edimitchel/AL_SMS

Conflicts:
	res/layout/activity_synchroniser.xml