Merge pull request #2 from nightscout/master

Latest dev
Updated strings
Updated strings
Added TimeChangeDetected string
Added TimeChangeDetected string
Add in migration from old style v1 rest uris to new style, e.g.
key@http://url.com -> http://key@url.com

Tested:
  Unit.
Aligning barcode config format with barcode generator.
Broke up tests
Added NightscoutPreferences getters and setters for PWD Name and Preferred units
Added PWD name to preference panel
Offline pebble support (requires offline pebble watch face)
Disabled battery reading again
Only display battery when root option is enabled
Merge branch 'rmbatindicator' into wip/offlinepebble

Conflicts:
	app/src/main/java/com/nightscout/android/MainActivity.java
	app/src/main/java/com/nightscout/android/preferences/PreferenceKeys.java
Time ago reported incorrectly if watch face under certain conditions.
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
Corrected mistake in strings

Fixed pref_header_cloud_storage, pref_dialog_mongodb_collection, pref_message_mongodb_collection and pref_default_mongodb_collection
Merge branch 'dev' of https://github.com/cgmnellanuvola/android-uploader into cgmnellanuvola-dev

Conflicts:
	app/src/main/res/values-it/strings.xml
	app/src/main/res/values-it/strings_activity_settings.xml
	app/src/main/res/values/strings.xml
Updated to use AndroidPreferences rather than SharedPreferences
Merge pull request #100 from nightscout/tr.resturitranslate

Add in migration from old style v1 rest uris to new style, e.g.
Clean up the settings activity. Because we are targeting sdk > 11, we
can remove a lot of cruft.

Add some preference validation. Add tests for validation. Note: this
only validates uri syntax, not if the hosts actual exist. That will come
later as a button (or something).

Tested:
  ./gradew clean test
Merge pull request #91 from nightscout/tr.prefvalidation

Clean up the settings activity. Because we are targeting sdk > 11, we
Make project work with Android Studio 1.0

Tested:
  Manually (Android Studio 1.0 on a mac), `./gradlew clean test`
Add `lint` task to same `./gradlew` call, so that we don't compile
everything twice on travis.