Merge origin/master

Conflicts:
	application/views/include/header.php
	application/views/inicio_view.php
	assets/css/certificados.css