Merge remote-tracking branch 'origin/master' into Verze-2.0

Conflicts:
	main.c
ss

sss
Merge remote-tracking branch 'origin/Verze-2.0'

Conflicts:
	main.c
Merge branch 'master' of https://github.com/romansvoboda/Test