Now with toolbars
Press any key to continue for real
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Changed menu icon
Merge branch 'master' into joint