Header fixes and Database class
Merge branch 'master' of https://github.com/Tagl/Verklegt2014