#
Merge branch 'BatchRoute'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/view/BatchExtendTab
	grails-app/conf/BootStrap.groovy