Set helper classes to final
Merge branch 'master' of github.com:lemonlabs/u2020-mortar
Dependency update