Social auth
Acabat auth
Merge branch 'master' of github.com:SenglarSalvatge/enrut.cat

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

Conflicts:
	db.sqlite3
	usuaris/urls.py
	usuaris/views.py