Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_main.xml