merge of '3a37cc3435714b0ed267c4f01159b77e1e59cd87'

ant.properties

app/build.gradle

app/libs/androidplot-core-0.6.0.jar

app/src/main/AndroidManifest.xml

...ain/aidl/net/i2p/android/router/service/IRouterState.aidl

.../net/i2p/android/router/service/IRouterStateCallback.aidl

.../com/hlidskialf/android/preference/SeekBarPreference.java

app/src/main/java/net/i2p/android/apps/EepGetFetcher.java

app/src/main/java/net/i2p/android/apps/NewsFetcher.java

.../java/net/i2p/android/i2ptunnel/TunnelDetailActivity.java

.../java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntry.java

...in/java/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java

...ain/java/net/i2p/android/i2ptunnel/TunnelEntryLoader.java

...in/java/net/i2p/android/i2ptunnel/TunnelListActivity.java

...in/java/net/i2p/android/i2ptunnel/TunnelListFragment.java

.../java/net/i2p/android/i2ptunnel/TunnelWizardActivity.java

...ain/java/net/i2p/android/i2ptunnel/TunnelWizardModel.java

...ain/java/net/i2p/android/i2ptunnel/util/TunnelConfig.java

.../main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java