Merge branch 'develop'
nuevo favicon + logo header
Merge branch 'master' into develop

Conflicts:
	css/vergel.css