some fixes
fixing merge conflict
fix
another merge fix
merge fix
fix for demographics returning array from dre
Merge pull request #33 from kwyoung11/master

Required fixes for ccda-generator export functionality