merge of '33b368d75d4b7536dd4a29efa35fba64e6dc409d'

apps/addressbook/java/src/net/i2p/addressbook/package.html

apps/i2psnark/java/src/org/klomp/snark/package.html

apps/i2psnark/java/src/org/klomp/snark/web/package.html

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/package.html

...unnel/java/src/net/i2p/i2ptunnel/localServer/package.html

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/package.html

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/package.html

...i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/package.html

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/package.html

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/package.html

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/package.html

apps/routerconsole/java/src/net/i2p/router/web/package.html

apps/sam/java/src/net/i2p/sam/package.html

apps/susidns/src/java/src/i2p/susi/dns/package.html

apps/susimail/src/src/i2p/susi/webmail/package.html

apps/systray/java/src/net/i2p/apps/systray/package.html