changed merchant screen
Merge branch 'master' of https://github.com/fabiopk/android_project.git