Refactoring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/eu/telecomnancy/CapteurTemperature.java
	src/eu/telecomnancy/Client.java