avances js
Merge branch 'master' of https://github.com/triploide/donde-reciclo

Conflicts:
	application/views/twig/pages/recycle/search.html.twig