Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/build.gradle
#	app/src/main/res/layout/activity_main.xml
#	settings.gradle