Add histroy statistics
Merge branch 'meter_system'

Conflicts:
	templates/user/meter_reading.html
	tsj/forms.py
	tsj/models.py