misc fixes
Merge branch 'mj/2.0/general' of github.com:ibidem/mjolnir-template-app into mj/2.0/general