Added option to choose preferred date format (12 or 24 hours)
Merge branch 'origin-main-master'

Conflicts:
	static/js/ui-utils.js
Merge branch 'origin-main-master'
abstract predictAR lookback and make it adjustable
fix parentheses to keep code unchanged when lookback=1
predictAR bug fixes
lookbackTime = FORTY_TWO_MINS when lookback=1
change predictAR lookback from 1 to 2 (5m to 10m)
attempt to prevent pebble to only read SGV values

Try to avoid reporting null for pebble by only considering SGV
records.

Many thanks to @elute for raising flags on this.
Merge pull request #183 from asidorovich/master

Option to switch between 12 and 24 hours time format
Merge branch 'dev' into wip/predictARLookback
Merge branch 'dev' into wip/predictARLookback
Merge pull request #194 from nightscout/wip/predictARLookback

predictAR lookback abstraction
give mbg's an outline to make them more distinct
Merge pull request #4 from nightscout/dev

20141018 - Updating local repo for Dev Branch