Aligning barcode config format with barcode generator.
Broke up tests
Changed the constructor signature for AndroidPreferences - now takes context instead of SharedPreferences.
Formatting changes
Pull default collection values from res files rather than hardcoded values
Updated to use AndroidPreferences rather than SharedPreferences
Merge branch 'dev' into kl.updatebarcode

Conflicts:
	app/src/main/java/com/nightscout/android/MainActivity.java
	app/src/main/java/com/nightscout/android/preferences/AndroidPreferences.java
	app/src/main/java/com/nightscout/android/settings/SettingsActivity.java
	app/src/test/java/com/nightscout/android/barcode/AndroidBarcodeTest.java
	core/src/main/java/com/nightscout/core/preferences/NightscoutPreferences.java
	core/src/main/java/com/nightscout/core/preferences/TestPreferences.java
Merged with settings refactor
Moved onActivityResult from static PreferenceFragment to MainPreferenceFragment
Cleanup
Merge pull request #103 from nightscout/kl.updatebarcode

Aligning barcode config format with barcode generator.