merge of '74266b0afe4ef1abef923c8389fb47263b9a39e1'

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

...2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

...java/src/net/i2p/router/web/ProfileOrganizerRenderer.java

...erconsole/java/src/net/i2p/router/web/ProfilesHelper.java

apps/routerconsole/jsp/configpeer.jsp

apps/routerconsole/jsp/profiles.jsp

core/java/test/net/i2p/crypto/AESInputStream.java

core/java/test/net/i2p/crypto/AESOutputStream.java

history.txt

hosts.txt

news.xml

router/java/src/net/i2p/router/Router.java

router/java/src/net/i2p/router/StatisticsManager.java

...et/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java

...er/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java

.../i2p/router/networkdb/kademlia/FloodfillPeerSelector.java

.../net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java

...a/src/net/i2p/router/networkdb/kademlia/PeerSelector.java

.../java/src/net/i2p/router/networkdb/kademlia/StoreJob.java

...ava/src/net/i2p/router/networkdb/kademlia/StoreState.java