555
Merge branch 'master' of github.com:SenglarSalvatge/enrut.cat
Interpret python ----> django
merge
Social auth google, social auth facebook comentada, social auth twiter en manteniment
Merge branch 'master' of github.com:SenglarSalvatge/enrut.cat

Conflicts:
	Rutes/settings.py
	Rutes/urls.py
Merge branch 'rutes'

Conflicts:
	Rutes/urls.py
	templates/base.html
	usuaris/urls.py