user-0828(need to fix bug)
user-0829(fix bug)ok
Merge branch 'user'

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