upgrade
some template stuff i guess
Merge branch 'intercloud_grails'

Conflicts:
	application.properties
	grails-app/conf/BuildConfig.groovy
	grails-app/conf/Config.groovy
	web-app/WEB-INF/applicationContext.xml
	web-app/WEB-INF/tld/spring.tld