update deployment instructions [ci skip]
fix deploy_to, and use stage
Merge pull request #250 from wvengen/feature-deploy

deployment with Capistrano 3 (in progress)
typo
Merge pull request #253 from wvengen/feature-cleaner_order_details

cleanup show order and add search
Merge branch 'master' into foodcoop-adam-beta

Conflicts:
	app/controllers/orders_controller.rb