Merge branch 'obfuscation_gateway_pinning' into 'master'

CHANGELOG

app/build.gradle

app/src/custom/res/values-pt-rBR/strings.xml

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

.../bitmaskclient/base/fragments/ObfuscationProxyDialog.java

...e/leap/bitmaskclient/base/fragments/SettingsFragment.java

...ain/java/se/leap/bitmaskclient/base/models/Constants.java

...ain/java/se/leap/bitmaskclient/base/models/Transport.java

...n/java/se/leap/bitmaskclient/base/utils/ConfigHelper.java

...va/se/leap/bitmaskclient/base/utils/PreferenceHelper.java

app/src/main/java/se/leap/bitmaskclient/eip/Gateway.java

.../main/java/se/leap/bitmaskclient/eip/GatewaysManager.java

...in/java/se/leap/bitmaskclient/eip/VpnConfigGenerator.java

app/src/main/res/layout-port/f_eip.xml

app/src/main/res/layout-xlarge-port/a_add_provider.xml

...c/main/res/layout-xlarge-port/a_custom_provider_setup.xml

...rc/main/res/layout-xlarge-port/a_provider_credentials.xml

app/src/main/res/layout-xlarge-port/a_provider_detail.xml

app/src/main/res/layout-xlarge-port/a_provider_list.xml

app/src/main/res/layout-xlarge-port/f_eip.xml