Fixed strange issues due to inconsistencies in database queries
Merge branch 'master' of https://github.com/utwente-di/di15