FINAL COMMIT
aMerge branch 'master' of https://github.com/avaquero/llibreria

Conflicts:
	TEMPLATES/base.html
a