nothing big
fixed merge
Automerge
automerge
Merge branch 'master' of https://github.com/mvk-team42/Veracitor
Merge branch 'master' of https://github.com/mvk-team42/Veracitor