user_controller update create method
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/products_controller.rb
add tags