add ca-certificates to nettemp install script
Merge branch 'beta'

add beta to stable master
gpio time after reboot
fix rrd create db
readme
Merge branch 'beta'

Conflicts:
	index.php
index
index
Merge branch 'beta'

test
Merge branch 'beta'

add beta to master
Merge branch 'beta'

rm beta
Merge branch 'beta'

add fix from beta
beta to master
Merge branch 'beta'

version
Merge branch 'beta'

fis install script
fix branch error
Merge branch 'beta'

add fox form beta
readme
Merge branch 'beta'

add function form beta
Merge branch 'beta'

add kwh to master