change import to be correct and consistent with xml
Merge remote-tracking branch 'origin/master'

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