Partly fixed error messages.
Merge branch 'master' of github.com:mvk-team42/Veracitor
Updated database test file.
Merge branch 'master' of github.com:mvk-team42/Veracitor