Fixes to the API to handle some bugs exposed due to VUMI integration tests
Merge branch 'master' of github.com:unicefuganda/ureport