Pull pro
Merge branch 'master' of https://github.com/SenglarSalvatge/enrut.cat
Footer
Merge branch 'master' into ramita

Conflicts:
	templates/base.html