flighbean
Merge branch 'master' of https://github.com/halafi/pa165-airport-manager

Conflicts:
	AirportManager/AirportManager-web/src/main/java/cz/muni/fi/pa165/airportmanager/web/beans/FligActionBean.java