modificado formulario contacto
modificados caledonian.css y base.twig
Merge branch 'dev'
Merge branch 'master' of https://github.com/edevelop/caledonian

Conflicts:
	app/cache/af/0b/d51ef064f775c637a3ef45eed732.php