Cleaned up some mess
Merge branch 'develop' into feat_HP_pbe02_textures
Possibility to map text on texture

First implementation, only basic functionality
Merge branch 'develop' into feat_HP_pbe02_textures
Cleaned up after merge