fix proxy support for composite ids in Hibernate plugins
Revert "rename some packages"

This reverts commit a524d445c5edd846172a8f5169cf78addc9dd398.
remove @Entity annotation
fix proxy support for composite ids in Hibernate plugins
Merge branch '3.x'
fix for Javassist NPE caused by Hibernate's PojoEntityTuplizer class creating non Groovy aware versions of JavassistProxyFactory
fix for Javassist NPE caused by Hibernate's PojoEntityTuplizer class creating non Groovy aware versions of JavassistProxyFactory for Hibernate 4
Test traits with javassist proxies
fix failing test: id property is required in Grails also for classes with composite id
Merge branch '3.x'

Conflicts:
	grails-datastore-gorm-hibernate/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy
	grails-datastore-gorm-hibernate4/src/test/groovy/org/codehaus/groovy/grails/orm/hibernate/CompositeIdentifierWithAssociationsTests.groovy
fix compilation error
rename org.codehaus.groovy -> org in packages