Refactored CmfBlockHelper
fixed tests
Fixed version
Merge pull request #82 from WouterJ/templating_changes

Templating changes