Drawing the menu only when it should
Merge branch 'interface_dev' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into interface_dev