Squashed 'root/database/src/main/resources/conf/' content from commit dedd852

git-subtree-dir: root/database/src/main/resources/conf
git-subtree-split: dedd852cdb05ee56c1cf218022f6d080a6f0b48f
Merge commit 'a2be70f53cd6786094e708923baffffa19309f6c' as 'root/database/src/main/resources/conf'
Merge branch 'sandpit' of github.com:SolidStateGroup/patientview into sandpit