Merge branch 'develop' of ssh://leap.se:22/bitmask_android into develop
Merge branch 'feature/token-based-auth' into develop

Conflicts:
	src/se/leap/bitmaskclient/ConfigurationWizard.java
	src/se/leap/bitmaskclient/Dashboard.java
	src/se/leap/bitmaskclient/ProviderAPI.java
	src/se/leap/bitmaskclient/ProviderListFragment.java
Merge branch 'bug/more-detailed-response-to-CW-errors' into develop
Merge branch 'feature/move-the-settings-button-to-the-overflow-menu' into develop
there's no about fragment anymore
No sharedprefs methods in ConfigHelper.

This means we obtain the SharedPreferences object each time we want to
use it. This yields to longer code lines while reading and writing to
them.