Stashing payment changes to work through bugs
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into payments

Conflicts:
	db/schema.rb
remove new tag from imprintables/basic_info view spec
going to apply stash
Payments First Iteration

Add payments table
Lay groundwork for creating payments through order edit view
Add methods to order
Expand Spec
NOTE: refunding payments is broken because of issues with modal,
      the next commit will fix those issues
Payments First Iteration

Add payments table
Lay groundwork for creating payments through order edit view
Add methods to order
Expand Spec
NOTE: refunding payments is broken because of issues with modal,
      the next commit will fix those issues
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into payments

Conflicts:
	app/views/imprintables/_size_color_availability.html.erb
	spec/helpers/application_helper_spec.rb
	spec/views/imprintables/show.html.erb_spec.rb
Payments Iteration 2

Streamline spec by directly visiting pages
Remove imprintable modal
Fix refunds
Expand spec
Merge branch 'payments' of https://github.com/AnnArborTees/softwear-crm into payments

Conflicts:
	app/controllers/payments_controller.rb
	app/models/order.rb
	app/views/payments/_payment_form.html.erb
	app/views/payments/_refund_form.html.erb
	app/views/payments/edit.html.erb
	app/views/payments/edit.js.erb
	db/migrate/20140623151424_add_payments_table.rb
	db/schema.rb
	spec/features/payments_spec.rb
	spec/models/order_spec.rb
Merge branch 'payments' of https://github.com/AnnArborTees/softwear-crm into develop-david
Add imprintable_modal helper
Merge branch 'develop' into develop-ricky

Conflicts:
	Gemfile.lock
	app/views/imprintables/_table.html.erb
	spec/features/imprintable_variants_spec.rb
	spec/features/imprintables_spec.rb
Merge branch 'develop' into develop-ricky

Conflicts:
	Gemfile.lock
	app/views/imprintables/_table.html.erb
	spec/features/imprintable_variants_spec.rb
	spec/features/imprintables_spec.rb
Merge branch 'develop' into develop-ricky

Conflicts:
	Gemfile.lock
	app/views/imprintables/_table.html.erb
	spec/features/imprintable_variants_spec.rb
	spec/features/imprintables_spec.rb