v1
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	app/src/main/res/layout/activity_main.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'