Instrument 'control mechanism' default #57517

broken because hashes are not ordered in ruby 1.8
don't die displaying a reservations table if the reservation is missing from order detail
tests on instrument for can_purchase?
files can't be uploaded after rename from FileUpload to StoredFile
Merge branch 'master' into shared_calendar

Conflicts:
	spec/models/instrument_spec.rb