Merge branch 'MainmenuMasterMerge' into 'master'

core/assets/buttons/battle_overlay.pdn

core/assets/crew/background.png

core/assets/enemy/battle_overlay.png

core/assets/ship/barrage/fed_cruiser_2_base.png

core/assets/ship/barrage/fed_cruiser_shields1.png

core/assets/ship/barragebase.png

core/assets/ship/barragefloor.png

core/assets/ship/boarder/circle_cruiser_2_base.png

core/assets/ship/boarder/circle_cruiser_shields1.png

core/assets/ship/boarderbase.png

core/assets/ship/boarderfloor.png

core/assets/ship/default/kestral_shields1.png

core/assets/ship/defaultbase.png

core/assets/ship/defaultfloor.png

core/assets/ship/killer/shields.png

core/assets/ship/killerbase.png

core/assets/ship/killerfloor.png

core/assets/ship/stealthbase.png

core/assets/ship/stealthfloor.png

core/assets/ship/tank/rock_cruiser_floor.png