Fixed frontend template links
Merge branch 'master' of https://github.com/AOEpeople/Zendesk into AOEpeople-master
Merge branch 'AOEpeople-master'