Updated test so they aren't broken anymore, updated databasequeries with prepared statements
Merge branch 'master' of https://github.com/utwente-di/di15