Merge remote-tracking branch 'upstream/master'  

Merge remote-tracking branch 'upstream/master'

Conflicts:
	pinax_theme_foundation/templates/account/login.html
	pinax_theme_foundation/templates/account/logout.html