merge of '6ccace0742effd1eaadcc151f428825fa3215e12'

apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java

core/java/src/net/i2p/I2PAppContext.java

core/java/src/net/i2p/util/SimpleByteCache.java

history.txt

installer/resources/eepsite/jetty.xml

router/java/src/net/i2p/router/RouterVersion.java

router/java/src/net/i2p/router/transport/UPnP.java

.../net/i2p/router/transport/udp/OutboundEstablishState.java

router/java/src/net/i2p/router/util/EventLog.java