user edit
Merge branch 'sample_20141208'
er
Conflicts:
	app/models/user.rb