Set template from Tree code
Set templates from Calendar code
Merge remote-tracking branch 'origin/development'