templates rearangements
Merge branch 'feature/auth' of github.com:kberov/Ado into feature/auth
- ammended commit which was already pushed