Do not crash on every incorrect input, added synonyms for 'and' and 'or', some small fixes
Merge pull request #1332 from qreal/parser-fixes

Do not crash on every incorrect input, added synonyms for 'and' and 'or', some small fixes