update secure_token
modeling-users
Merge branch 'modeling-users' ~

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	spec/models/user_spec.rb