Merge pull request #20 from cividesk/master

Corrects not calling crmURL in multiple templates, causing multiple issues
template cleanup and fixed broken links