Merge pull request #155 from ctumwebaze/master

General refactoring of the FormSection Functionality and internal API
Merge pull request #157 from ctumwebaze/master

Fixes flacky failing tests
@ctumwebaze @mwangiann rapidftr/tracker#152 changes the enquiries data structure on mobile.

This fix removes the hard coded criteria field on the Enquiries data model and fixes a bunch of failing tests.