baby monitoring
Merge branch 'webserver' of https://github.com/k-team/g-home into webserver
sert a rien
Merge branch 'master' into webserver
Transformation des timestamps en HH:MM + reglagle de l'espacement
Ajout de champs en plus sur le module weather
Merge branch 'webserver'

Conflicts:
	webclient/public/js/main.js
Merge branch 'master' of https://github.com/k-team/g-home

Conflicts:
	webclient/public/js/main.js
	webclient/public/partials/module_inject.html