Location label, Timepicker integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	QuickLunch.html