updated
Merge remote-tracking branch 'origin/master'
updated
updated
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/his_controller.rb
	app/views/his/Action.html.erb
updated
updated