male upravy
Merge remote-tracking branch 'kuko/master'

Conflicts:
	poser/main.pdf