Thibault Denuc
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml
	local.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/strings.xml
	local.properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	local.properties
rajouter bouton Thibault Denuc