displaying errors
Merge branch 'login_template' of https://github.com/digitalgreenorg/dg into login_template

Conflicts:
	dg/templates/social_website/login.html