Changed valid_transition? to validates_machine_type
Seeds for roles :material and :shipper
Access control, corrections and tests for shipments and related changes

Conflicts:
	app/models/ability.rb