Merge [#589] for 2.3.7 release

adding late commit for RSR 2.3.7 Watermelon release - API resource change for akvo.org release