URL + template bugfix
Merge remote-tracking branch 'origin'
Lastest calendar