confictec hcange
Merge commit 'b5a8ea100329a18990a6f91354895e939dee093e' into THEME-54-integration-via-git-repo

Conflicts:
	templates-repositories/PetrKotek/theme2/Theme2/content.txt