Merge Dev into Master for Deployment to App

[mbh329]

This PR is meant to incorporate recent changes to the CPDB page including issues #239 and #224.

Each individual issue had an associated PR that was reviewed so mostly we are just checking that the dev app works locally and that all functionality is as expected so that we can deploy the qaqc app