prepared merge
Merge branch 'dev' into dev_AO
Added jetflame to spaceman
fixed the flames