Merge branch 'master' into production
Merge branch 'master' into production
Update url template tag, and make urls more explicit