query editor stuff, incomplete
Merge branch 'master' of https://github.com/wandora-team/wandora