Merge branch 'master'
Merge branch 'origin/master'
#12 rename batchRouteReportDetStore to batchRouteParamsStore
# Layout
*Combobox
Merge branch 'Layout'
Merge branch 'master'
#13 待協助loadStore異常
#13 loadbatchRouteParam(Ajax) 批號途程參數查詢完成
Merge branch 'origin/TouchBatchParams'

Conflicts:
	extjs-app/foodprint.xds
# All Combobox
# listJson
Merge branch 'master'
Merge branch 'Layout'
Merge branch 'touchFileUpload'

Conflicts:
	extjs-app/foodprint.xds
	touch-app/foodprintTouch.xds
	touch-app/metadata/Application
	touch-app/metadata/view/Fileupload
update xda
finished touch fileUploadPanel