fix loadouts
fix resizing in geoscape
Merge branch 'master' into fairPsionics