Header link fix
Pages template fixed
Merge branch 'b10_pages_template' into develop
Merge branch 'develop'