Order edit, index, new
Order edit, index, new
imprint delete button
Added gems used in testing
Shipping Methods to push to show usage
Shipping Methods Features All Done
Shipping Method Model Spec, no need for show, added color to logos
Shipping Methods View Specs
Using default functionality of inherited_resources
Merge branch 'develop' into develop-nigel-order-index-view

Conflicts:
	spec/controllers/orders_controller_spec.rb
	spec/spec_helper.rb
	spec/views/orders/index.html.erb_spec.rb
	spec/views/orders/new.html.erb_spec.rb
Moved form specific test logic to _form.html.erb_spec
Forgot to remove piece of hardcoded html (fixed)
Lots of cleanup and completion; edit page needs reworking
Change orders edit view to correct interface
Merge branch 'hard-coded-mockups' into develop-nigel-order-index-view

Conflicts:
	Gemfile.lock
	app/assets/images/logo.png
	app/assets/stylesheets/application.css
	app/views/orders/edit.html.erb
	app/views/orders/index.html.erb
	app/views/orders/new.html.erb
	app/views/shared/_head.html.erb
	app/views/shared/_sidebar_menu.html.erb
	config/routes.rb
Added timestamp fields to orders (forgot to do this in initial creation)
Adjust new form and form builder to prepare for Ricky's error handling
Add commission amount field to order model
Add validation for phone number format validation error message
Start working on order edit page