Merge branch 'updated-gems' into dropdown-select2-updated-gems

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/application.css
Merge branch 'updated-gems' into dropdown-select2-updated-gems
make select2-bootstrap styling work with select 3.4.1+
make select2 in modal dialog receive focus
update deployment instructions [ci skip]
fix deploy_to, and use stage
don't use select2 by default
Merge branch 'dropdown-select2-updated-gems' into foodcoop-adam-new

Conflicts:
	Gemfile.lock
Merge pull request #250 from wvengen/feature-deploy

deployment with Capistrano 3 (in progress)
don't fail when visiting page requiring approval without being authenticated
Merge branch 'master' of github.com:foodcoops/foodsoft into foodcoop-adam-new