fixes #2020
Merge branch 'master' of github.com:dotCMS/dotCMS
missing icon added #1884
Merge pull request #2024 from dotCMS/issue-1884-missing-icon

missing icon added #1884
fixes #1888
Merge pull request #2026 from dotCMS/issue-1888-update-library-nekohtml-from-1.9.6-to-1.9.17

fixes #1888