Resolve IP
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev
Added village trigger
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev
Updating references to uuids, fixed location, transition to new tshikaji_data
Merge branch 'dev' of https://github.com/IMA-WorldHealth/Kapok into dev