Added peer review fixes.
Merge branch 'develop' of github.com:basekit-templates/Mikkeli into develop

Mergeing metadata