UIV-880 only show location when city is available
Merge branch 'develop' of github.com:cultuurnet/culturefeed_bootstrap into develop