Fixed a few warnings
Merge remote-tracking branch 'upstream/master'
Merge https://github.com/Sadikum/Vriska into Sadikum-master
Revert some changes from the pull request