error messages
Merge branch 'master' of https://github.com/lmponceb/correspondencia

Conflicts:
	config/autoload/local.php