Integrated ModuleManager in the mainmenu (CAP-77)
Merge branch 'moduleManager'