Merge branch 'master' of github.com:futurice/annihilation
Merge branch 'master' of github.com:futurice/annihilation
Unknown or missing city param