Updated and fixed browserid logins

Conflicts:
	requirements.txt
	src/templates/base.html