Merge branch 'master' into hosting
Merge branch 'hosting' of ssh://10.178.227.213/home/pavel/projects/intranet into hosting