Merged recent modelcatalogue.cpp and macosx changes.

--
user: Michael Guravage <michael.guravage@cwi.nl>
branch merge
branch 'default'
changed src/ChangeLog
changed src/VirtualLeaf-install-macosx/01virtualleaf-contents.xml
changed src/VirtualLeaf-install-macosx/01virtualleaf.xml
changed src/VirtualLeaf-install-macosx/02models-contents.xml
changed src/VirtualLeaf-install-macosx/02models.xml
changed src/VirtualLeaf-install-macosx/03leaves-contents.xml
changed src/VirtualLeaf-install-macosx/03leaves.xml
changed src/VirtualLeaf-install-macosx/index.xml
changed src/modelcatalogue.cpp