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

Conflicts:
	AirportManager/AirportManager-web/src/main/resources/StripesResources.properties