Update
Changed Bladewolf borg module from security to combat
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into rei20

Conflicts:
	html/changelog.html
Merge pull request #767 from Rei1226/rei20

Bug Fixes, New Suit, New Borg Module