Celso
Merge branch 'master' of https://github.com/dereckleme/desenvolvimento

Conflicts:
	module/Base/config/module.config.php
celso