# Conflicts:
#   domain-module/src/main/java/cz/muni/fi/pa165/airportmanager/domainmodule/service/RetrieveEntityServiceImpl.java
#   domain-module/src/main/java/cz/muni/fi/pa165/airportmanager/domainmodule/service/RetrieveMultipleEntitiesByIdServiceImpl.java
#   domain-module/src/main/java/cz/muni/fi/pa165/airportmanager/domainmodule/service/RetrieveMultipleEntitiesService.java
#   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/facade/FlightFacade.java
#   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/facade/FlightFacadeImpl.java
#   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/rest/FlightController.java
#   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/facade/PlaneFacade.java
#   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/facade/PlaneFacadeImpl.java
#   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneController.java
#   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/service/FlightServiceImpl.java
#   plane-module/src/test/java/cz/muni/fi/pa165/airportmanager/planemodule/facade/PlaneFacadeImplTest.java
#   plane-module/src/test/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneControllerTest.java
#   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/facade/StewardFacadeImpl.java
#   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/rest/StewardController.java
#   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/service/AirlineServiceImpl.java
#   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/service/DestinationServiceImpl.java
#   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/endtoendtests/StewardEndToEndTests.java
#   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/facade/StewardFacadeTest.java
#   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/integrationtests/StewardIntegrationTest.java
#   steward-module/src/test/java/cz/muni/fi/pa165/airportmanager/stewardmodule/service/StewardServiceTest.java

[Feat] Runnable Scenarios

See merge request !89

[Fix] Forwarding authtoken to called service

See merge request !87

More plane tests

See merge request !90

# Conflicts:
#   destination-module/src/main/java/cz/muni/fi/pa165/airportmanager/destinationmodule/data/model/Destination.java
#   flight-module/src/main/java/cz/muni/fi/pa165/airportmanager/flightmodule/data/repository/FlightRepository.java
#   steward-module/src/main/java/cz/muni/fi/pa165/airportmanager/stewardmodule/rest/StewardController.java

Grafana

See merge request !77

Flight auth fix

See merge request !88

Comments on some "unclear" parts of the code

See merge request !86

Resolve "Annotations with constraints to entities" in destination module

See merge request !85