user id add
Merge branch 'add-userid'

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