Actualzando envío de correo y etc...
Merge branch 'master' of https://github.com/yonhmaikel/spmillen

Conflicts:
	symfony/config/databases.yml
	symfony/log/email.log
	symfony/log/orangehrm.log