add cmake options for the clang static analyzer
Don't let mods try to rewrite Ufopaedia article types, it's sick nasty. Just make a new article.
Fixed disabled keyboard shortcuts still triggering.
grumble grumble static
testing git builder
Revert "testing git builder"

This reverts commit 174961d59652fb0d7c29bfd9fe9a2f43ea57b48f.
Text fixes
Merge pull request #816 from myk002/clang_fixes

add cmake options for the clang static analyzer
Merge remote-tracking branch 'upstream/master' into testing
fix terror ships
Fixed funny business with empty fighter weapon slots.
fix for scout drone issue

and missing thing from previous push
fix intro stretching
resizing behaviour infrastructure

includes stuff for options screen adjustments and whatnot
resizing behaviour infrastructure

dynamically resize the battlescape and geoscape based on scale options.
maintains pixel size at all times.
fix for bug 553
fix for bug 546

swaps the sound of the grenade and cannons to apparently vanilla settings
i can't tell the difference between them myself.
fix mistakes

repent
fix shit
Merge remote-tracking branch 'upstream/master' into testing