Merge branch 'develop' of https://github.com/H4412/GL into develop
Merge branch 'develop' of https://github.com/H4412/GL into develop
corrected data model (linking errors)