Solucionado bug en hover team
Merge remote-tracking branch 'origin/master'
Añadido gmap a contacto
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/contacto.html.haml