Merge branch 'develop' into release-0.9.4

app/assets/urls/riseup.url

app/build.gradle

...st/java/se/leap/bitmaskclient/test/ConnectionManager.java

...Test/java/se/leap/bitmaskclient/test/testVpnFragment.java

app/src/insecure/AndroidManifest.xml

app/src/insecure/assets/urls/cdev.bitmask.net.url

app/src/insecure/assets/urls/dev.bitmask.net.url

...ecure/java/se/leap/bitmaskclient/ConfigurationWizard.java

...nsecure/java/se/leap/bitmaskclient/NewProviderDialog.java

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

...re/java/se/leap/bitmaskclient/ProviderDetailFragment.java

...ecure/java/se/leap/bitmaskclient/ProviderListContent.java

app/src/insecure/res/layout-xlarge/new_provider_dialog.xml

app/src/insecure/res/layout/new_provider_dialog.xml

app/src/insecure/res/values/strings.xml

app/src/main/java/de/blinkt/openvpn/LaunchVPN.java

...ction/java/se/leap/bitmaskclient/ConfigurationWizard.java

...duction/java/se/leap/bitmaskclient/NewProviderDialog.java

...rc/production/java/se/leap/bitmaskclient/ProviderAPI.java

...on/java/se/leap/bitmaskclient/ProviderDetailFragment.java