made entity annotations inherited automatically
Merge branch 'master' of github.com:gaelyk/gaelyk