add location and do some cliening on old files
Merge branch 'master' of https://github.com/elxnis/MyCityAndroid