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 pull request #255 from wvengen/feature-orders_group_edit

Edit order_group_article result in orders screen