wip
Merge branch 'tr.prefvalidation' of github.com:nightscout/android-uploader into tr.prefvalidation

Conflicts:
	app/src/main/java/com/nightscout/android/preferences/PreferencesValidator.java
	app/src/main/java/com/nightscout/android/settings/SettingsActivity.java
	core/src/test/java/com/nightscout/core/utils/RestUriUtilsTest.java