added string
Merge branch 'master' into layout

Conflicts:
	app/src/main/res/values/strings.xml
Merge branch 'layout'