[#220] Fix updates box to use new API data

Add country and city

Call API filtering on updates with photos

Update theme templates to reflect the shortcode changes

Code cleanup
[#220] Merge branch 'develop' of github.com:akvo/akvo-web into develop