last updates

Signed-off-by: Matt McCormick <matt.c.mccormick@gmail.com>
Merge branch 'master' of https://github.com/marbemac/cbmpath-requisition

Signed-off-by: Matt McCormick <matt.c.mccormick@gmail.com>

Conflicts:
	app/controllers/requisition_forms_controller.rb
	app/views/requisition_forms/_show.slim