Cleanup
Merge branch 'kl.updatebarcode' into wip/offlinepebble

Conflicts:
	core/src/main/java/com/nightscout/core/preferences/NightscoutPreferences.java
	core/src/main/java/com/nightscout/core/preferences/TestPreferences.java
Implementing recommended changes from code review