fix i18n buglet
Merge pull request #256 from wvengen/feature-partial_shared_sync

Small change to allow non-shared articles with shared suppliers
fix "Mysql2::Error: This connection is in use by" in spec for Rails 4

Conflicts:
	Gemfile
	Gemfile.lock
cleanup articles sorted in groups
allow to edit GroupOrderArticle result from orders screen

Conflicts:
	app/assets/javascripts/application.js
Merge branch 'feature-orders_group_edit' into foodcoop-adam-beta

Conflicts:
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/delta_input.js
	app/controllers/group_order_articles_controller.rb
	app/controllers/orders_controller.rb
	app/helpers/finance/balancing_helper.rb
	app/helpers/group_order_articles_helper.rb
	app/views/finance/balancing/new.html.haml
	app/views/orders/show.html.haml
	config/locales/en.yml
don't use ajax for add article