custom tags and attributes fix
{{}} support html tags fix
merge from develop
Merge branch 'stable2' into develop