Refactoring DatabaseReconciliator; trying to simplify things
Merge branch 'newreconciliator' into develop