bugfix
Merge branch 'master' of github.com:octris/core
improved constant names
added html-comment context
added escaping for html comments