Categorias em 80%
Merge origin/master

Conflicts:
	application/views/admin/index.php