mergin web and webserver
Merge branch 'web' of https://github.com/tdubourg/ghome into web
Merge branch 'demo2' into web

Conflicts:
	js/server/webserver.js
Merge branch 'master' of https://github.com/tdubourg/ghome into web
merging and resolving conflicts
sqlite3 is planteform dependent, removing it from project