Fixed server crash due to new ASM stuff
Merge branch 'master' of github.com:Deadrik/TFCraft
Version Bump
Merge remote-tracking branch 'upstream/master'