Do not override context-blocks config.
Merge pull request #163 from v3knet/hotfix/dont-override-context-block

Do not override context-blocks config
Merge branch 'dev-master' into site/crom

* dev-master:
  Do not override context-blocks config.