Bug fix for query builder for "OR" operator in criteria string
Update CHANGELOG
Merge branch 'master' of https://github.com/panada/Panada
update CHANGELOG