Merge branch 'develop' into 'feature/36-level-design'

# Conflicts:
#   assets/game_assets/tilesets/tileset.json
2 jobs for feature/36-level-design in 3 minutes and 51 seconds (queued for 2 seconds)