Amélioration build gradle
Merge branch 'master' of https://github.com/jpwilsch/photoshow

Conflicts:
	build.gradle