Merge branch 'master' into network

core/assets/ship/cruiser/anaerobic_cruiser_floor.png

core/assets/shippick_on.png

core/assets/shipselector/button_easy_on.png

core/assets/shipselector/button_hard_on.png

core/assets/shipselector/button_normal_on.png

core/assets/shipselector/button_typea_on.png

core/assets/shipselector/button_typeb_on.png

core/assets/shipselector/button_typec_on.png

core/assets/shipsys/crosshairs_placed.png

core/assets/shipsys/engine/enginegreen.png

core/assets/shipsys/engine/engineorange.png

core/assets/shipsys/engine/engineover.png

core/assets/shipsys/engine/enginered.png

core/assets/shipsys/low_o2_stripes_1x2.png

core/assets/shipsys/low_o2_stripes_2x1.png

core/assets/shipsys/low_o2_stripes_2x2.png

core/assets/shipsys/shields/shieldsgreen.png

core/assets/shipsys/shields/shieldsorange.png

core/assets/shipsys/shields/shieldsover.png

core/assets/shipsys/shields/shieldsred.png