added to users model & registration page
Merge branch 'development' of github.com:thecourseforum/theCourseForum into development

Conflicts:
	app/models/user.rb