LLLLL
Merge branch 'master' of https://github.com/miso231/PA165-CarPark

Conflicts:

	CarParkApp-client/src/main/java/cz/muni/pa165/carparkapp/client/BranchClient.java

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