basic entity
Merge branch 'develop' of github.com:kapla/scrumbag into develop