Merge branch 'release_2.0' into develop
Made it clearer that Poverty map is a paid map
Merge branch 'release_2.0.1'