Merge branch 'develop' into 'check-style'

# Conflicts:
#   plane-module/src/main/java/cz/muni/fi/pa165/airportmanager/planemodule/rest/PlaneController.java