Some small cleanup
Merge branch 'develop' of https://bitbucket.org/shouldit/android-proxy into develop
Working on WifiProxySyncService
Merge branch 'develop' of https://bitbucket.org/shouldit/android-proxy into develop

* 'develop' of https://bitbucket.org/shouldit/android-proxy:
  Some small cleanup

Conflicts:
	proxy-settings/src/main/java/com/lechucksoftware/proxy/proxysettings/receivers/ProxyChangeReceiver.java
	proxy-settings/src/main/java/com/lechucksoftware/proxy/proxysettings/services/WifiSyncService.java