modifs
Merge branch 'dom' of https://github.com/hugodes/editeur-web into dom

Conflicts:
	dom.cc