Entity model
Merge branch 'master' of https://github.com/groep5/eenalien.git