Merge branch 'refs/heads/master' into resolve-conflicts-between-dev-main

# Conflicts:
#	flight-management/src/main/java/cz/muni/fi/pa165/flights/service/FlightService.java
#	flight-management/src/test/java/cz/muni/fi/pa165/flights/service/FlightServiceTest.java
#	resources-management/src/main/java/cz/muni/fi/pa165/resources/service/AirplaneService.java
#	resources-management/src/main/java/cz/muni/fi/pa165/resources/service/DestinationService.java