new airport controler and JSP's
Merge remote-tracking branch 'origin/master'

Conflicts:
	flight-business/flight-business.iml
	flight-web/src/main/resources/Texts_sk.properties
	flight-web/src/main/webapp/WEB-INF/tags/layout.tag