test saveBatchRouteParams
Merge branch 'origin/master'
#13 saveBatchRouteParams finished
try FileUpload
Merge branch 'origin/TouchBatchParams'

Conflicts:
	touch-app/metadata/controller/BatchParamsCarouselController
	touch-app/metadata/view/BatchRouteParamsPanel
#13 batchRouteParams FileUpload finished