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

Conflicts:
	llibreria/settings.py
commit