Merge branch 'master' of https://github.com/oflow-oss/asso

Conflicts:
	src/main/groovy/core/model/AclClass.groovy
	src/main/groovy/core/model/AclClassDomain.groovy
	src/main/groovy/core/model/AclEntry.groovy
	src/main/groovy/core/model/AclEntryDomain.groovy
	src/main/groovy/core/model/AclObjectIdentity.groovy
	src/main/groovy/core/model/AclObjectIdentityDomain.groovy