changed User model
Merge remote-tracking branch 'poedem/master'

Conflicts:
	app/models/user.rb
	db/schema.rb
	spec/models/user_observer_spec.rb