Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Update pom file to give this project it's own artifactid
Update project to use new database models
changed the provider Id to include the protocol as well.