Issue65 synch buildings

This pull request will merge various small fixes to the `Annex60` library that have been detected when merging the `Annex60` library into the `Buildings` library.

With these fixes, all models of the `Annex60` library will be identical in the `Buildings` library, except for the `Media` package and its use, as this is still experimental.