imageupload prototype #11
Merge branch 'origin/imageUpload'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/Application
	extjs-app/metadata/controller/ItemEditorController
	extjs-app/metadata/view/ItemViewer
imageupload prototype #11 merge