assign 2.5
Merge branch 'master' of git://github.com/wyr4137/ICS5-Map
capitalized M
revised environmental issue deleted env category freshwater scarcity and corrected the deleted third env issue
resolved conflicts in country explorer
Merge pull request #295 from chuddle/master

Resolved conflicts