Refactoring templates
Merge branch 'master' of github.com:dextra/dextranet