# Layout version2 R2
Merge branch 'Layout'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/view/BatchParamsCollectWindow
	extjs-app/metadata/view/BatchParamsParamGrid
Merge branch 'origin/master'