starting migration for schedules
Merge branch 'master' into shared_calendar
convert reservations.instrument to reservations.product

including database changes
refactor out parts of reservations into different concerns
refactored reservationcontroller#move for skinnier controller action
refactored Reservation#conflicting_reservation into scopes
refactor relay methods out of instrument into module
cleaning up instruments
upgrade factorygirl to 4.1

also, move factories into their own files

Conflicts:
	spec/controllers/facility_reservations_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/models/order_detail_spec.rb
	spec/models/reservation_spec.rb
	spec/product_shared_examples.rb
Merge branch 'factory_girl' into shared_calendar

Conflicts:
	spec/controllers/facility_reservations_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/models/order_detail_spec.rb
	spec/models/reservation_spec.rb
	spec/product_shared_examples.rb
bad merge
upgrade factorygirl to 2.6.4

also, move factories into their own files
Merge branch 'factory_girl_upgrade' into shared_calendar

Conflicts:
	Gemfile
	Gemfile.lock
	spec/controllers/facility_reservations_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/factories/nufs_accounts.rb
	spec/factories/products.rb
	spec/factories_env.rb
	spec/models/order_detail_spec.rb
	spec/models/reservation_spec.rb
	spec/product_shared_examples.rb
	spec/spec_helper.rb
factories for getting reservations set up nicely
add schedule into factories and fix specs broken because of it
fix for Instrument#last_available_hour
include shared schedule reservations in controller actions
include product name as part of calendar object
interface for setting up shared schedule on instrument create
extract new product setup factories to appropriate files