updated husky
solved merge conflicts+
Merge pull request #180 from sulu-cmf/feature/block-redesign

updated husky