changed stuff
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014