Add block tags support
Add support for blocksupplier module && refactor CSS rules
Merge branch 'develop'