Merge branch 'uicleanup' into foodcoop-adam

Conflicts:
	Gemfile.lock
	README.md
	app/assets/javascripts/ordering.js
	app/views/articles/upload.html.haml
	app/views/group_orders/_form.html.haml
	config/environments/development.rb.SAMPLE
	config/locales/en.yml