Trying to address #542
Merge pull request #707 from onaio/542_map_load_order

Trying to address #542