komentare a zrychleni
Merge branch 'master' of github.com:kolovsky/PT_SP

Conflicts:
	Airport.java
	Calendar.java