Merge pull request #18 from ribalba/develop_ribalba

The API project now passes all tests.
Merge branch 'develop' of https://github.com/eHealthAfrica/formhub into develop

* 'develop' of https://github.com/eHealthAfrica/formhub: