Review main Merged

14115[TASK] Remove mapping for ModuleItems

Wouter Wolters CR +2 V +2 Easy +3 −33 updated 06/03/13, 20:49