Upgraded config files
Added basic Shana template
Merge branch 'shana' of github.com:francesco-carrella/mail-factory into shana

* 'shana' of github.com:francesco-carrella/mail-factory:
  Added basic Shana template