add vouchers, calendar...
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/web/base.html
	templates/web/rezervace.html