Merge branch 'editor' of http://github.com/edvorg/drash
bugs fixed
editor merged
Merge branch 'editor' of https://github.com/edvorg/drash into editor