Added colony details

Merged colony details and disputes
Pushed country data computation to backend
Fixed country selection
Merge branch 'master' into gh-pages