More hard work in builder.js
Merge branch 'feature/hsm' of https://github.com/txemagon/lluvia-Project into feature/hsm