Entities finished
Still required integration of pendingaction functions.
Merge branch 'master' of github.com:leils/CPE102