Merge branch 'bleeding-edge-freeze' of git://github.com/Gamerofthegame/Baystation12
Merge branch 'master' of github.com:Baystation12/Baystation12
Virus event is now again virus2.
Merge pull request #2295 from CIB/master

Fix virus event