Montagem do módulo usuário
Merge branch 'master' of https://github.com/jospin/core

Conflicts:
	config/application.config.php