uprava videa
Merge remote-tracking branch 'origin/master'

Conflicts:
	php/app/View/Pages/home.ctp
uprava presmerovani
uprava Hl.stranky, tvorba nove stranky: Videa
uprava videa
Merge branch 'master' into vasek

Conflicts:
	php/app/View/Pages/home.ctp
uprava videa