Added content negotiation and new version of wesCountry
Merge branch 'develop'
Changed database to pass tests