Added sorting of templates by names.
Merge remote-tracking branch 'origin/master'