Merge private with public
Merge branch 'master' of github.com:PDI-DGS-Protolab/building-blocks-material