Uprava sprava rezervaci
Uprava tisku techniky
Merge remote-tracking branch 'origin/develop'

Conflicts:
	admin/mod_rezervace/rezervace.php
Merge develop