Merge branch 'origin_0.9.8'

CHANGELOG

app/assets/calyx.net.json

app/assets/riseup.net.json

app/assets/urls/calyx.net.url

app/assets/urls/demo.bitmask.net.url

app/assets/urls/riseup.net.url

...secure/java/se/leap/bitmaskclient/ProviderApiManager.java

app/src/main/AndroidManifest.xml

app/src/main/ic_launcher-web.png

app/src/main/java/de/blinkt/openvpn/core/OpenVPNService.java

app/src/main/java/se/leap/bitmaskclient/ConfigHelper.java

.../java/se/leap/bitmaskclient/ConfigWizardBaseActivity.java

app/src/main/java/se/leap/bitmaskclient/Constants.java

app/src/main/java/se/leap/bitmaskclient/Dashboard.java

...ain/java/se/leap/bitmaskclient/DrawerSettingsAdapter.java

app/src/main/java/se/leap/bitmaskclient/EipFragment.java

app/src/main/java/se/leap/bitmaskclient/MainActivity.java

app/src/main/java/se/leap/bitmaskclient/Provider.java

app/src/main/java/se/leap/bitmaskclient/ProviderAPI.java

...in/java/se/leap/bitmaskclient/ProviderApiManagerBase.java