#15 履歷呈現調整
Merge branch 'master'
# Layout version2 R4
#
Merge branch 'master'
#15履歷查詢畫面調整
Merge branch 'mobileshow'
# Grid Combobox Select
operation
Merge branch 'origin/FireBranch'

Conflicts:
	extjs-app/foodprint.xds
workstation id select change title
Merge branch 'origin/master'

Conflicts:
	touch-app/metadata/controller/BatchReportController
# Combo
Merge branch 'master'
remove BatchRouteGrid plugin
Merge branch 'origin/master'

Conflicts:
	extjs-app/foodprint.xds
# Layout version2 R4
Merge branch 'master'

Conflicts:
	extjs-app/foodprint.xds
Merge branch 'Layout'
Merge branch 'origin/master'