Merge branch 'master' into simply-linux

Conflicts:
        desktop-software/internet/web/index.txt
Remove unused files