cambios
Merge branch 'master' of https://github.com/robhunt3r/web

Conflicts:
	app/config/routing.yml
	src/Web/ClavesWifiBundle/Resources/views/layout.html.twig
	web/.htaccess
añadido wpspin y arreglado routing para DEV sin dominio