test commit
Merge branch 'master' of https://github.com/tepani/testaja

Conflicts:
	src/java/org/grails/activiti/springsecurity/SpringSecurityGroupManagerFactory.java