Merge remote-tracking branch 'origin/master'

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