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.