Fix database locked error in unittests
Fix trailing whitespace
Fix merge conflict
Merge branch 'master' of github.com:v1kko/SWE_2013_Groep2