Merge branch 'develop'

Conflicts:
	app/build.gradle
	build.gradle
	gradle/wrapper/gradle-wrapper.properties