Fixed merge bug.
Merge branch 'master' of github.com:mvk-team42/Veracitor