Merge branch 'master' into rails4

Conflicts:
	Gemfile
	Gemfile.lock
	app/models/group_order_article.rb
	app/views/stockit/index.html.haml
	config/routes.rb