portal

Conflicts:
	portal/application/config/database.php

Agregando htaccess