Merge origin/master

Conflicts:
	application/views/ComporNoticia.php
Merge origin/master

Conflicts:
	application/views/ComporNoticia.php
Merge origin/master

Conflicts:
	Styles/EstiloIndex.css
	application/views/NoticiaGrande.php