JOINDIN-428 added canonical and shortlink url
Merge branch 'TomCan-master'