f
Merge remote-tracking branch 'origin/master'

Conflicts:

	CarParkApp/src/main/java/cz/muni/pa165/carparkapp/util/EmployeeConverter.java