Updates for Grails 2.4

Hi, 
This pull request contains all the previous changes plus changed need to work with Grails 2.4. These changes  will not work with Grails 2.3