Extending grammar based on conceptual requirements.
Updated syntax highlighter based on latest grammar.
Added Common cql logic from Chris.