#1 ItemRoute
+ BootStrap
Merge branch 'ItemRoute'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/Application
	extjs-app/metadata/view/ItemViewer
	grails-app/conf/BootStrap.groovy
Merge branch 'origin/master'

Conflicts:
	extjs-app/foodprint.xds
	extjs-app/metadata/Application