Merge pull request #400 from dennishendriksen/master

Cleanup database interface + other stuff
Update of README.md
Merge pull request #401 from joerivandervelde/master

Update of README.md
fix #142 - generated entity equals incorrect