Merged Annex60 library.

Merge latest version of the Annex60 library into the Buildings library.