Changes in templates
Fixed conflicts with the merge