Merge branch 'refs/heads/development' into fixes-before-m4

# 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