Merge branch 'renderLayerGui' of https://gitlab.uni-koblenz.de/CVFP_DF18/Framework into renderLayerGui