Update modules.php
Merge branch 'develop-qm' of https://github.com/JetAlone/ERP into develop-qm

Conflicts:
	php/application/controller/module.php