order sitemap like the tree structure
display plugin string in alias plugin
Merge branch 'develop' into fix-sitemap
Merge branch 'develop' into alias-fix
Merge branch 'develop' into alias-fix
Merge branch 'develop' into fix-sitemap
Merge pull request #3429 from digi604/alias-fix

display plugin string in alias plugin
Merge pull request #3428 from digi604/fix-sitemap

order sitemap like the tree structure
Merge remote-tracking branch 'upstream/develop' into develop