Change ts sort algorithm to sortText
Use lowercase names in template's dictSort
Cleanup unwanted spaces
Merge pull request #446 from daniviga/upstream

Change ts sort algorithm to sortText