Merge commit '2e6bdc74aa270148ad68f960fb8e6637f6e029c9'

Conflicts:
	_install.php
	application/classes/controller/contacto.php
	application/classes/controller/core/frontend.php
	application/classes/controller/inicio.php
	application/classes/controller/portafolio.php
	application/classes/kohana/exception.php
	application/views/view_contacto.php
	application/views/view_inicio.php
	assets/css/frontend/img/._.DS_Store
	assets/css/frontend/img/.______header.jpg
	assets/css/frontend/img/._blog.png
	assets/css/frontend/img/._bullet.gif
	assets/css/frontend/img/._folder.png
	assets/css/frontend/img/._here.png
	assets/css/frontend/img/._home.png
	assets/css/frontend/img/._mail.png
	assets/css/frontend/img/._other.png
	assets/css/frontend/img/_____header.jpg
	assets/css/frontend/portafolio.css
	assets/css/frontend/template.css