Changes to be committed:
	modified:   PA165_vozovyPark-web/src/main/resources/Localization_en.properties
	modified:   PA165_vozovyPark-web/src/main/resources/Localization_sk.properties
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/applicationContext.xml
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/mvc-dispatcher-servlet.xml
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/view/VehicleList.jsp
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/view/allVehicles.jsp
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/view/testPage.jsp
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/view/vehicle/vehicleForm.jsp
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/view/vehicle/vehicleView.jsp
	modified:   PA165_vozovyPark-web/src/main/webapp/WEB-INF/vozovyPark-servlet.xml
Pokus

lokalizacia
Merge branch 'master' of https://github.com/Marrko/PA165_vozovyPark

Conflicts:
	PA165_vozovyPark-web/src/main/webapp/WEB-INF/view/testPage.jsp