Merged Annex60 library.
Merged Annex60
Merged Annex 60
Updated medium model for #265
Merge branch 'master' into Annex60Sync
Updated reference results
Merge pull request #265 from lbl-srg/Annex60Sync

Annex60 sync