Fixed the overwritten module controller header file
Synced from master
Merge branch 'competition' of http://www.github.com/MOD-ASL/SimulationPlugins into competition