Merge branch 'master' into feature-orders_group_edit

Conflicts:
	app/controllers/orders_controller.rb
add html units history line
do not crash on received articles
add html units history line
allow to view stock orders too
allow to view stock orders too
Merge branch 'master' into feature-orders_group_edit
fix merge
Merge branch 'feature-orders_group_edit' into foodcoop-adam-beta
current_orders i18n