mapa desktop
Merge branch 'master' of https://github.com/triploide/donde-reciclo

Conflicts:
	_compile/less/blocks/search-location-form.less
	application/views/twig/pages/recycle/map.html.twig
	html/css/large.css