test6 improved
Merge branch 'editor' of http://github.com/edvorg/drash into editor