cp, working on fixing up order scenarios
Merge remote-tracking branch 'origin/cukes' into cukes
Merge remote-tracking branch 'origin/cukes' into cukes
some cleaning
Merge remote-tracking branch 'origin/cukes' into cukes

Conflicts:
	features/checkout_flow.feature
	features/step_definitions/http_steps.rb
Merge remote-tracking branch 'origin/cukes' into cukes
Merge remote-tracking branch 'origin/cukes' into cukes

Conflicts:
	features/rest/bank_accounts.feature
	features/rest/cards.feature
	features/rest/customers.feature
Merge remote-tracking branch 'origin/cukes' into cukes
Merge remote-tracking branch 'origin/cukes' into cukes

Conflicts:
	features/orders.feature
removing failing tag from card scenarios
cleaning orders features
trying new link resolve system
fix
another one working
fixing bank account rest scenarios
fixed 404 error
canceling an order
the end is nearing
one more to go
I did it, its done, no more failing