asdf
Merge branch 'master' of https://github.com/avaquero/llibreria

Conflicts:
	llibreria/settings.py
g
asdf
Merge branch 'master' of https://github.com/avaquero/llibreria
face
Merge branch 'master' of https://github.com/avaquero/llibreria
FINAL SOCIAL AUTH!!!!!!!!!!!!!!!!!!
Merge branch 'master' of https://github.com/avaquero/llibreria
LLL