Merge origin/master

Conflicts:
	Styles/EstiloIndex.css
Merge origin/master

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