Merge branch 'integration'
addition of some support files and dao manager
refactored jpa and couchdb into own libraries