city-merge
pickup cache clear module
Merge branch 'master', remote branch 'yadu/master'
city mamangement added(merging cities)