modify BatchParams
Merge branch 'origin/master'
try BatchParams
Merge branch 'origin/master'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/Application