Stop crashing if no request in context
Conflicts:
	allauth/socialaccount/templatetags/socialaccount.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	allauth/socialaccount/templatetags/socialaccount.py