Should be working
Merge remote-tracking branch 'origin/master' into Java_Version_non-HTML
Added icons into project.
CI changes.