#2 Toolbar modify (not to use controller)
Merge branch 'ModifyToolbar'

Conflicts:
	extjs-app/foodprint.xds