Updated queries and test
Merge branch 'master' of https://github.com/utwente-di/di15
Merge branch 'database_new' of https://github.com/utwente-di/di15 into database_new
Converted database queries to prepared statements
Merge branch 'static_pages'
Merge conflicts while merging database_new into master: