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
Merge branch 'master'