Fixed database entity objects
Merge branch 'master' of https://github.com/kimpe88/Distributed-Mining-Admin

Parallel work