upravy
Merge branch 'win8asus_masterpage' of https://github.com/duchij/is into winonmac_masterpage
oprava
Conflicts:
	header.ascx.cs
epc priprava
praca na novom hlasku