build gradle file
Merge branch 'master' of https://github.com/androidsoft-org/Arbres-remarquables

Conflicts:
	build.gradle
Merge branch 'master' of https://github.com/androidsoft-org/Arbres-remarquables

Conflicts:
	build.gradle