Database structure
Merge branch 'peter' of https://github.com/cymox1/npev2 into peter