Commiting changes to LocalizationActivity.
Changes to Customer Android app on displaying merchant page.
Merge branch 'master' of https://github.com/kaoyama/MCMProject