test strings.xml 추가
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values-ja/strings.xml