テスト修正
Merge branch 'master' of https://github.com/itomalion/workspace
Merge branch 'master' of https://github.com/itomalion/workspace

Conflicts:
	KONY/res/values/strings.xml