added email_re, removed in Django1.6
import re
Merge branch 'master' into nns_version

Conflicts:
	registration_email/auth.py