Added new entity
Merge branch 'develop'
Merge branch 'develop' of https://github.com/thedarkjester/CPD7045 into develop