introduced EntityBase
Merge remote-tracking branch 'origin/master' into feature/restapi
Merge branch 'develop' into feature/restapi