Merge branch 'lock_emphasis'

add a feature to lock emphasis state

change color table

add guide to weekend, change mode merge.py

add guide and center the legend group

add grouping feature

change legend gap to 0

Merge branch 'refactor'

add Gap between entries in legend, and some changes to merge.py

now graphs are highlighted by rolling-over mouse on legend area

fix indentations around chart-creation

align sensor row

add name of the sensors

change merge-script to handle xz files

merge script now look for master directory

zoom to a week at init time

Merge branch 'sync_with_both'

synchronize both charts

add baloon text for values and postfix units for legend-value

enable value line , and change color of scroll line

ok, with this commit?