Update Gradle
Merge branch 'master' into development

Conflicts:
	gradle/wrapper/gradle-wrapper.properties