primarily white space cleanup in templates and therefore generated code
added support for nested protection merge (for css styling in html template text)
bump version
bump version