export WS
Merge remote-tracking branch 'origin/master'

Conflicts:
	ecorelevesensor/models/data.py
	ecorelevesensor/views/individuals.py

Merge Yacine's work.
Merge branch 'master' of https://github.com/NaturalSolutions/ecoReleve-Sensor

Conflicts:
	setup.py

Continue merging Yacine's work.