add boolean operators "AND" and "OR"
Merge branch 'master' into cgi