bugz, testz...
Merge branch 'dev'

Conflicts:
	ed.js