Merge branch 'master'
# Layout
*Combobox
Merge branch 'Layout'
Merge branch 'master'
Merge branch 'origin/TouchBatchParams'

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

Conflicts:
	extjs-app/foodprint.xds
	touch-app/foodprintTouch.xds
	touch-app/metadata/Application
	touch-app/metadata/view/Fileupload
update xda
#14 itemRoute batchRoute OK!
Merge branch 'Route'
Merge branch 'master'
finished touch fileUploadPanel
Merge branch 'touchFileUpload'
#30 Sequence
Merge branch 'Route'
Merge branch 'origin/master'