Merge remote-tracking branch 'origin/kento126' into k242hd

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
共通署名によるマップ表示モック
Merge remote-tracking branch 'origin/feature-#1' into feature-#5
ちょいいじ