Merge pull request #500 from akvo/develop

RSR v2.3.5 Uglyfruit Release/Candidate
[#474] Set maps to scrollable and reset interactive global maps
Merge pull request #502 from akvo/hotfix/474_maps

[#474] Hotfix for scrollable maps and interactive global maps
Merging this as the other one was code reviewed, and I want it gone from the UI :tongue: