update readme and changelog

Author: gregsh

CHANGELOG.md

@@ -1,11 +1,16 @@
+2017.1.7
+
+* GPUB: extract extend_marker_impl and improve error elements handling
+* Generator: fix base class calculation for merged AST and PSI
+* NPE: JFlexStateUsageSearcher.processQuery
+
 2017.1.6
 
 * Generator: generate Java 8 syntax: `generate=[java="8"]`
 * Generator: generate TokenSets for token choices: `generate=[token-sets="yes"]`
 * Generator: wrap anonymous classes with functions
 * RGH: fix left rule with several usage detected as recursive
 
-
 2017.1.5
 
 * Editor: _Move Element Left/Right_ action in BNF
@@ -14,7 +19,6 @@
 * Generator/PSI: parameter annotations
 * GPUB: configurable token-advancer
 
-
 2017.1.4
 
 * Editor: inject Regexp in BNF and Java in JFlex

resources/META-INF/plugin.xml

@@ -14,10 +14,9 @@
   <change-notes>
     <![CDATA[
     <ul>
-      <li>Generator: generate Java 8 syntax: generate=[java="8"]</li>
-      <li>Generator: generate TokenSets for token choices: generate=[token-sets="yes"]</li>
-      <li>Generator: wrap anonymous classes with functions</li>
-      <li>RGH: fix left rule with several usage detected as recursive</li>
+      <li>GPUB: extract extend_marker_impl and improve error elements handling</li>
+      <li>Generator: fix base class calculation for merged AST and PSI</li>
+      <li>NPE: JFlexStateUsageSearcher.processQuery</li>
     </ul>
     <a href="https://github.com/JetBrains/Grammar-Kit/blob/master/CHANGELOG.md">Full change log...</a>
     ]]>