modify config
Merge branch 'origin/master'
workstation upgrade
batch upgrade
add ExtJSBootStrap
Ext JS BootStrap 初版完成
finish grails upgrade
Merge branch 'origin/upgradeGrails'

Conflicts:
	grails-app/controllers/foodprint/ReportViewerController.groovy
	grails-app/services/foodprint/DomainService.groovy
Merge branch 'origin/extbs'

Conflicts:
	grails-app/conf/BuildConfig.groovy
remove /rest/* urlMapping
update config
Merge branch 'origin/callPaint'