merge branch minimum_balance into master (closes #133)
Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles

only add undeleted articles in balancing screen
Merge branch 'master' into uicleanup
inform members about a minimum order quantity when relevant
Merge branch 'uicleanup' into foodcoop-adam-new

Conflicts:
	config/app_config.yml.SAMPLE