#15 履歷呈現調整
#12 變更tab名稱
try Touch
#15履歷查詢畫面調整
Merge branch 'mobileshow'
operation
Merge branch 'origin/FireBranch'

Conflicts:
	extjs-app/foodprint.xds
#13 loadbatchRoute
#13 batchRoute sorting
Merge branch 'origin/master'

Conflicts:
	touch-app/metadata/controller/BatchReportController
Merge branch 'master'