Merge remote-tracking branch 'remotes/origin/master' into 2462

Conflicts:
	grails-app/conf/GrailsMelodyConfig.groovy
	grails-app/views/index.gsp