Merge pull request #5 from d3athrow/Bleeding-Edge

Bleeding edge
Merge pull request #6 from d3athrow/Bleeding-Edge

Bleeding edge
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Merge pull request #1163 from Iamgoofball/butt

XCOM UPDATE
Merge remote-tracking branch 'upstream/Bleeding-Edge' into riW3nfAj
Move dbcore into libs/
Merge pull request #1164 from ESwordTheCat/riW3nfAj

Move dbcore to libs/
Fixing up iamagoofball's new Armory section

- New room removed. Just no
- Secure Armory was instead extended one tile north
- Flashers moved on the sides and XCOM supplies at the end
- Air alarm moved and Firing Range's obscured windows removed
- A few badly done areas by Brig were fixed
- Syndicate Elite shuttle landing point was moved to fit changes to
Security Maint
- Windows changed to Rwindows in Sec Bathroom, because NO-ONE wants
plain glass windows
Merge pull request #8 from d3athrow/Bleeding-Edge

Bleeding edge
I am worse then hitler.
I'm really sorry.
Merge pull request #1167 from Heredth/nazifix

The goyim know
Merge pull request #1165 from Iamgoofball/butt

Adds the Muton Race.
Merge pull request #1166 from dylanstrategie/Bleeding-Edge

Fixing up iamagoofball's new Armory section
Fix dreamdaemon crash at dreamdaemon startup.
Merge pull request #1168 from ESwordTheCat/riW3nfAj

Fix dreamdaemon crash at dreamdaemon startup.
Merge pull request #9 from d3athrow/Bleeding-Edge

Bleeding edge
Added Discount Dan's Vending Machine
Added trash items for the junkfood