Fixed item controller bug for rspec
Added loading bar for when payment is processing
Reroute order to show page on success
Changed order show depending on admin or not
Added pagination and order show fixes
Changed order # display
Edited admin view of all orders
Changed page rendered after trying to add existing credit card
Fixed errors on adding credit card from showing in view if adding was in the account
Merge branch 'master' into orders

Conflicts:
	app/models/delivery_point.rb
	db/schema.rb
Changed user interface for choosing credit cards at check out
Fixed some bugs
Merge branch 'orders' into checkout
Fixed bug to hide progress bar
Merge branch 'checkout' of github.com:kishkaru/project-mule into checkout
Removed user_orders view
Put Braintree config into production
Fix UI overflow
Working on cucumber
Checkout cucumber