commit for merge
Merge branch 'master' of https://github.com/NaturalSolutions/ecoReleve-Sensor

Conflicts:
	ecorelevesensor/views/station.py