Email and SMS settings to local settings. Fixed email validation
Improved escaping
Merge branch 'master' into email_and_sms

Conflicts:
	filesharing/filesharing/local_settings.py.template
Merge branch 'email_and_sms'