Merge branch 'hotfix/2.1.2.1'
Put back limit=100 for global maps

Set limit = 100 for number of records to fetch to global maps in one
API call.
Merge branch 'master' of github.com:akvo/akvo-rsr into develop

Conflict resolved in:
	akvo/mediaroot/akvo/js/src/akvo-maps.js