Trochę zmian w sumie jest.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/kiwi/dao/AirportDao.java
	src/main/java/kiwi/models/DbLotniskoEntity.java
	src/main/java/kiwi/utils/HibernateUtil.java
	src/main/webapp/WEB-INF/view-elements/header.jsp