Re-enabled the hybrid ABox functionality
Added new hybrid ABox functionality
Merge branch 'develop' of https://github.com/ontop/ontop.git into develop