#12 finished batchParams Image
Merge branch 'origin/BatchParams'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/Application
	extjs-app/metadata/view/BatchParamsEditor
	extjs-app/metadata/view/BatchParamsEditorCt

#12 BatchParams Image
Merge branch 'master'