Fix template (on calendar & tree)
Merge remote-tracking branch 'origin/development'