Application templates refactoring
Merge pull request #3903 from creocoder/better-application-templates

Application templates refactoring