fixed url issue in template
Merge branch 'develop'