Merge branch 'BatchRoute'
Merge branch 'BatchRoute'
Merge branch 'BatchRoute'
Merge branch 'BatchRoute'
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
imageupload #11  with upload delete
imageupload #11  showImage move to itemView.display
Merge branch 'BatchRoute'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/Application
#mainContainBtn
Merge branch 'master'