Fix compilation errors and add relations
Merge branch 'master' of github.com:denisneuling/db2eshop