* demos/demo.ml.nw:
Merge branch 'master' of github.com:aryx/syncweb

Conflicts:
	commons