Merge branch 'master' into support-scalalogging

Version.sbt

-version in ThisBuild := "0.2.1-SNAPSHOT"
+version in ThisBuild := "0.3.1-SNAPSHOT"

intellij-plugin/project/plugins.sbt

 addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.5")
\ No newline at end of file
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.6")
\ No newline at end of file

intellij-plugin/src/main/resources/patch/change.html

 <![CDATA[
+<ul> 0.3.0:
+    <ol>
+        <li>support @equalsAndHashCode</li>
+        <li>support generic @apply, @builder</li>
+    </ol>
+</ul>
 <ul> 0.2.0:
     <ol>
         <li>support @builder, @log, @json, @apply</li>

project/plugins.sbt

@@ -3,6 +3,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
 addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
 addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.13")
 addSbtPlugin("org.jetbrains" % "sbt-ide-settings" % "1.1.0")
-addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.5")
+addSbtPlugin("org.jetbrains" % "sbt-idea-plugin" % "3.12.6")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.6.0")
 addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.8.2")