merged couchDB data with formHub data in a single service
Merge branch 'develop' into merge-data-source
Merge pull request #31 from musamusa/merge-data-source

Merge data source