Begin simplify DatabaseReconciliator (unfinished)
Merge branch 'develop' into simplifyrecon
Commenting (and tiny refactoring) of DatabaseReconciliator
Merge branch 'simplifyrecon' into develop