prepared merge
Merge branch 'dev' into dev_AO
Added jetflame to spaceman
fixed the flames
Merge branch 'dev_LA' into dev
rotates freezebolt and math-h upgrade