Siteurl reference removed from templates
Merge branch 'hotfix/v0.3'