mise à jour suite merge
mise à jour suite merge
Merge branch 'aude' of git@github.com:moea-chan/ATA_geoloc_media.git
into aude
Merge remote-tracking branch 'origin/aude'

Conflicts:
	res/layout/activity_users.xml
	res/values/strings.xml
	src/com/mediageoloc/ata/user/GitHubService.java