Add config.xml and icon.png.
Merge branch 'master' into server