Improved @entity annotation behavior and removed static
Merge branch 'repositoryAnnotation' into develop