change string2
Merge branch 'master' into feature

Conflicts:
	app/src/main/res/values/strings.xml
string changes! setting + setting
pullreq test
Merge pull request #2 from cm-hashimoto-saki/feature-feature

Feature feature