conflict resolved
conflicts resolved
Merge branch 'master' of https://github.com/elxnis/MyCityAndroid