file dbms.js committed
Merge branch 'master' into floEtJu

Conflicts:
	js/server/dbms.js
merging dbms conflicts
changement de la bdd + requete SQL pour action simple
WIP still
maj task_executor
Merge branch 'master' into web
Merge branch 'master' into web
Merge branch 'master' into web
add manquant
update events_monitor
debug espaces
update events_monitor
Merge branch 'floEtJu' of github.com:tdubourg/ghome into floEtJu
blah
update events_monitor
update events_monititor
blahblah
traala
update events_monitor