t
Merge remote-tracking branch 'origin/master'

Conflicts:

	CarParkApp-web/src/main/java/cz/muni/pa165/carparkapp/web/CarsController.java
	CarParkApp/derby.log