KOK
KOK
KOK
Merge remote-tracking branch 'origin/master'

Conflicts:
	CarParkApp/pom.xml

	CarParkApp/target/classes/cz/muni/pa165/carparkapp/DAO/EmployeeDaoImpl.class

	CarParkApp/target/classes/cz/muni/pa165/carparkapp/Entities/Employee.class