updated gitignore
Merge branch 'master' of https://github.com/unicefburundi/ureport-project into develop
removed unecessary print in generic, and all traces of json
fixed merge
Merge branch 'master' of https://github.com/unicefburundi/ureport-project
Merge branch 'develop'