Removed unused resources
Merge remote-tracking branch 'origin/CallebergBranch'
Merge remote-tracking branch 'origin/LinusBranch'
Merge remote-tracking branch 'origin/LinusBranch'
General code fixes

Weapons now have types
Merge remote-tracking branch 'origin/CallebergBranch'
Bug fix
Window can now switch between fullscreen and windowed
Merge remote-tracking branch 'origin/master' into LinusBranch