.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Group-A/Controllers/Module/createModuleController.php