Merge pull request #322 from manolo/mcm_custom_elements

Adding support for custom html elements.
Merge branch 'master' into mcm_special_events