delete annotation @Entity
Merge branch 'develop'