ending version 2 commit
Merge branch 'master' of https://github.com/lucascrx/QualOutdoor-Interfaces-NodeServer

Conflicts:
	serveur.js~