get correct info for periods
Merge remote-tracking branch 'origin/master'

Conflicts:
	getjson.php
	input_elec_logging.php
	utils.php
get correct info for periods