ssss
Merge branch 'master' of https://github.com/estrategasdigitales/koratta

Conflicts:
	application/views/linea/footer.php
	application/views/linea/header.php
	application/views/linea/index.php