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

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