Made entity work

Fixed database
Merge remote-tracking branch 'refs/remotes/origin/master'