# 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'
Merge branch 'master'
# Layout version2 R3
Merge branch 'Layout'
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
#12 變更tab名稱