Change
Merge remote-tracking branch 'origin/master'

Conflicts:
	CarParkApp/derby.log

	CarParkApp/target/surefire-reports/TEST-cz.muni.pa165.carparkapp.DAO.EmployeeDaoImplTest.xml

	CarParkApp/target/surefire-reports/cz.muni.pa165.carparkapp.DAO.EmployeeDaoImplTest.txt