change of htmlstyleguide
Merge remote-tracking branch 'origin/bootstrap' into Issue2099
jsp style guide
Merge remote-tracking branch 'origin/master' into Issue2099
Merge branch 'master' into Issue2099
[2099] Clean up for html/jsp style guide

fixes #2099
Merge remote-tracking branch 'origin/master' into Issue2131