Fix headers on Linux
Merge https://github.com/Sadikum/Vriska into Sadikum-master
Revert some changes from the pull request
Set warning level of VS to 4 and fix more warnings
Merge remote-tracking branch 'upstream/master'