Made validates_machine_type more robust for the specs
Seeds for roles :material and :shipper
Access control, corrections and tests for shipments and related changes

Conflicts:
	app/models/ability.rb