updates
Merge branch 'mj/1.0/general' of github.com:ibidem/mjolnir-template-app into mj/1.0/general