nb  specific stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/drw.js
improved loading and put example