Merge pull request #1217 from voltan/develop

Add blocks for comment module
Set template capture value explicitly
Typo fixes
Added support for context in template so that module/component css files have hight priority than layout css