PLANET-91 action-template-episerver.html created without conflicts
PLANET-91 indentations and empty spaces fixed