solve one name conflict in modelling
Merge branch 'master' of https://github.com/labproject/ProceduralBuidings