Merge pull request #204 from FWAJL/dev

Dev to feature_service_providers branch
Issue #190

All the Dao classes now are updated to use the latest DB schema
Merge branch 'feature_service_providers' into dev