Git merging > Merge dev_phase2 code into main branch

[sofia-tekdatum]

After the main branch is up to date, merge all of dev_phase2 changes into the main branch.

We might define a safe sequence of changes to try to merge, although since all changes are interdependent, we should try first to merge everything to avoid any breakages.

[sofia-tekdatum]

Main branch is up to date.

Created a very basic PR using github web UI that tries to merge dev_phase2 into this updated main. It's quite messy, so we won't be able to use it for real merging, but it gives us an idea of where we stand.

#211

[sofia-tekdatum]

Thanks to argmarco@ for all the help in completing the merge.