fixed a typo in comment for API, which shows as option in meta on website
branding of rest freamework api page
Merge pull request #385 from ercchy/master

Branding of API documentation page
Pass the country_code to the template being rendered. Fixes an error seen multiple times on the server
Merge pull request #387 from goranche/fix-countrycode-notexits

Pass the country_code to the template being rendered.
Added test for PR #387
Merge pull request #388 from goranche/fix-countrycode-notexits

Added test for PR #387
Merge pull request #390 from gandalfar/api-improvements

truncate event description in API, make more link in marker a button
Merge pull request #391 from gandalfar/geoip_fix

Fixes GeoIP at codecatz HQ
fix merge conflict