Add city/country to event during creation/change.
Merge branch 'metrics' of github.com:startexploding/webmaker-events into metrics