accessories:

order details can have a child record.
ProductAccessory now have a type that might autoupdate the quantiy
on reservation time change
Interface for selecting scaling type when adding accessory
new interface for accessory input

include time-view of accessory input
remove old pick_accessories action
changed pick_reservations code to coffeescript
fix authorization for accessory adding
pick_accessories view has be obviated
start new order edit page
Merge branch 'upgrades' into accessory_scaling

Conflicts:
	app/views/shared/_reservations_table.html.haml
	config/routes.rb
Merge branch 'accessory_scaling' into new_order_edit_page
include date.js as part of main assets
start new order detail edit screen
ajax updating of costs when quantity/times change
use clockpunch gem instead of copying in
Merge branch 'upgrades' into accessory_scaling
Merge branch 'accessory_scaling' into new_order_edit_page
convert times to time format on order screen
Merge branch 'upgrades-bootstrap' into order_edit_bootstrap

Conflicts:
	.gitignore
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.scss
	app/views/facility_account_users/new.html.haml
	app/views/product_accessories/index.html.haml
	app/views/reservations/pick_accessories.html.haml
	app/views/shared/_reservations_table.html.haml
accessories modal now uses bootstrap
order management to bootstrap