Merge branch 'develop'

.gitignore

CHANGELOG

app/build.gradle

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

app/src/main/AndroidManifest.xml

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

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

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

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

...rc/main/java/de/blinkt/openvpn/fragments/LogFragment.java

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

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

...c/main/java/se/leap/bitmaskclient/EipServiceFragment.java

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

app/src/main/res/drawable-hdpi/ic_stat_vpn.png

app/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png

app/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png

app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png

app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png

app/src/main/res/drawable-hdpi/ic_vpn_disconnected.png