Task 65817
Merge branch 'tomas_branch' of https://github.com/martelit/arcada-projekt14 into tomas_branch

Conflicts:
	doc/Test.txt