adicionando arquivo
Merge branch 'master' of https://github.com/fbuttazzi/EquitEnem_Web.git

Conflicts:
	administrator/logs/error.php