Repaired
Delete all
Merge remote-tracking branch 'origin/master'

Conflicts:
	CarParkApp-API/pom.xml

	CarParkApp-API/src/main/java/cz/muni/pa165/carparkapp/dto/EmployeeDTO.java

	CarParkApp-API/target/classes/cz/muni/pa165/carparkapp/dto/EmployeeDTO.class
	CarParkApp-API/target/maven-archiver/pom.properties

	CarParkApp-API/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

	CarParkApp-API/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	CarParkApp-web/pom.xml

	CarParkApp-web/src/main/java/cz/muni/pa165/carparkapp/configuration/MySpringMvcConfig.java

	CarParkApp-web/src/main/java/cz/muni/pa165/carparkapp/configuration/MyStartInitializer.java

	CarParkApp-web/src/main/java/cz/muni/pa165/carparkapp/web/BranchController.java

	CarParkApp-web/src/main/java/cz/muni/pa165/carparkapp/web/CarController.java

	CarParkApp-web/src/main/java/cz/muni/pa165/carparkapp/web/EmployeeController.java
	CarParkApp-web/src/main/resources/Texts_en.properties
	CarParkApp-web/src/main/resources/Texts_sk_SK.properties
	CarParkApp-web/src/main/webapp/WEB-INF/jsp/addEmployee.jsp
	CarParkApp-web/src/main/webapp/WEB-INF/jsp/formBranch.jsp
	CarParkApp-web/src/main/webapp/WEB-INF/jsp/formCar.jsp
	CarParkApp-web/src/main/webapp/WEB-INF/jsp/formEmployee.jsp
	CarParkApp-web/src/main/webapp/WEB-INF/jsp/service.jsp
	CarParkApp-web/src/main/webapp/WEB-INF/tags/layout.tag
	CarParkApp-web/src/main/webapp/style.css
	CarParkApp-web/target/CarParkApp-web.war

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/Texts_en.properties

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/Texts_sk_SK.properties

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/cz/muni/pa165/carparkapp/configuration/MySpringMvcConfig.class

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/cz/muni/pa165/carparkapp/configuration/MyStartInitializer.class

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/cz/muni/pa165/carparkapp/web/BranchController.class

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/cz/muni/pa165/carparkapp/web/CarController.class

	CarParkApp-web/target/CarParkApp-web/WEB-INF/classes/cz/muni/pa165/carparkapp/web/EmployeeController.class
	CarParkApp-web/target/CarParkApp-web/WEB-INF/jsp/addEmployee.jsp
	CarParkApp-web/target/CarParkApp-web/WEB-INF/jsp/formBranch.jsp
	CarParkApp-web/target/CarParkApp-web/WEB-INF/jsp/formCar.jsp
	CarParkApp-web/target/CarParkApp-web/WEB-INF/jsp/formEmployee.jsp

	CarParkApp-web/target/CarParkApp-web/WEB-INF/lib/CarPark-API-1.0-SNAPSHOT.jar

	CarParkApp-web/target/CarParkApp-web/WEB-INF/lib/CarParkApp-1.0-SNAPSHOT.jar
	CarParkApp-web/target/CarParkApp-web/WEB-INF/tags/layout.tag
	CarParkApp-web/target/CarParkApp-web/style.css
	CarParkApp-web/target/classes/Texts_en.properties
	CarParkApp-web/target/classes/Texts_sk_SK.properties

	CarParkApp-web/target/classes/cz/muni/pa165/carparkapp/configuration/MySpringMvcConfig.class

	CarParkApp-web/target/classes/cz/muni/pa165/carparkapp/configuration/MyStartInitializer.class

	CarParkApp-web/target/classes/cz/muni/pa165/carparkapp/web/BranchController.class

	CarParkApp-web/target/classes/cz/muni/pa165/carparkapp/web/CarController.class

	CarParkApp-web/target/classes/cz/muni/pa165/carparkapp/web/EmployeeController.class
	CarParkApp-web/target/maven-archiver/pom.properties

	CarParkApp-web/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

	CarParkApp-web/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	CarParkApp/derby.log
	CarParkApp/pom.xml

	CarParkApp/src/main/java/cz/muni/pa165/carparkapp/Entities/Employee.java

	CarParkApp/src/main/java/cz/muni/pa165/carparkapp/serviceImpl/EmployeeServiceImpl.java

	CarParkApp/src/test/java/cz/muni/pa165/carparkapp/DAO/EmployeeDAOImplTest.java

	CarParkApp/src/test/java/cz/muni/pa165/carparkapp/Service/EmployeeServiceTest.java

	CarParkApp/src/test/java/cz/muni/pa165/carparkapp/Service/LoanServiceImplTest.java
	CarParkApp/target/CarParkApp-1.0-SNAPSHOT.jar

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

	CarParkApp/target/classes/cz/muni/pa165/carparkapp/serviceImpl/EmployeeServiceImpl.class
	CarParkApp/target/maven-archiver/pom.properties

	CarParkApp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

	CarParkApp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

	CarParkApp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

	CarParkApp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

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

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

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

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

	CarParkApp/target/surefire-reports/TEST-cz.muni.pa165.carparkapp.Service.BranchServiceImplTest.xml

	CarParkApp/target/surefire-reports/TEST-cz.muni.pa165.carparkapp.Service.CarServiceTest.xml

	CarParkApp/target/surefire-reports/TEST-cz.muni.pa165.carparkapp.Service.EmployeeServiceTest.xml

	CarParkApp/target/surefire-reports/TEST-cz.muni.pa165.carparkapp.Service.LoanServiceImplTest.xml

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

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

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

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

	CarParkApp/target/surefire-reports/cz.muni.pa165.carparkapp.Service.BranchServiceImplTest.txt

	CarParkApp/target/surefire-reports/cz.muni.pa165.carparkapp.Service.CarServiceTest.txt

	CarParkApp/target/surefire-reports/cz.muni.pa165.carparkapp.Service.EmployeeServiceTest.txt

	CarParkApp/target/surefire-reports/cz.muni.pa165.carparkapp.Service.LoanServiceImplTest.txt

	CarParkApp/target/test-classes/cz/muni/pa165/carparkapp/DAO/EmployeeDAOImplTest.class

	CarParkApp/target/test-classes/cz/muni/pa165/carparkapp/Service/EmployeeServiceTest.class

	CarParkApp/target/test-classes/cz/muni/pa165/carparkapp/Service/LoanServiceImplTest.class
	pom.xml