Database now persistent in test env
Merge branch 'waterwheelDisp' of https://github.com/mickado82/multimediaApp.git into waterwheelDisp