update
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/nelox/img/ustav.jpg