Merge branch 'hotfix/2.16.03'
Cleaned up APL gradle source sets
Fixed Timber logging
Merge branch 'hotfix/v2.16.04' into develop

Conflicts:
	proxy-settings/build.gradle
Merge branch 'develop' of https://bitbucket.org/shouldit/android-proxy into develop

* 'develop' of https://bitbucket.org/shouldit/android-proxy:
  Cleaned up APL gradle source sets