Text fixes
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into statStrings
Fix compilation error on Linux
Deal with "type qualifiers ignored" compile warnings on Linux
Handle conditionNames array a little less crappily
Merge pull request #816 from myk002/clang_fixes

add cmake options for the clang static analyzer
fix terror ships
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into statStrings
Fixed funny business with empty fighter weapon slots.
fix for scout drone issue

and missing thing from previous push
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into statStrings
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into statStrings
Don't use std::to_string
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
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into statStrings
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into statStrings
Fixing gcc "type qualifiers ignored on function return type" warnings