update template to have urls in (hard coded...)
Merge remote-tracking branch 'origin/master'