n
Merge branch 'master' of https://github.com/InfWGospodarce/projekt.git

Conflicts:
	transporter-server/src/main/webapp/WEB-INF/jsp/Views/base/article/articleList.jsp