removed email regex. covered by devise
Merge branch 'dev'

Conflicts:
	app/models/registration.rb