Merge branch 'master' into network

.gitlab-ci.yml

...resources/game_data/img/scoreUI/gameover_victory_main.png

core/assets/FTL_JUMP.png

core/assets/autofire_on.png

core/assets/close_on.png

core/assets/continue.png

core/assets/continue_on.png

core/assets/control/mainmenu.png

core/assets/crew/anaerobic.png

core/assets/crew/battle.png

core/assets/crew/energy.png

core/assets/crew/health_box.png

core/assets/desktop.ini

core/assets/enemy/box_hostiles_boss.png

core/assets/escape_options_on.png

core/assets/event/eventbackground.png

core/assets/gameover/gameover_main.png

core/assets/gameover/victory_background.png

core/assets/gameuis/box_weapons_bottom.png

core/assets/gameuis/energybar.png