Merge branch 'master' into enrique-2-13-1-update

Author: kiroco12

project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.7
+sbt.version=1.3.8

project/plugins.sbt

@@ -1,5 +1,5 @@
 resolvers += Resolver.sonatypeRepo("snapshots")
-addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % "1.6.0")
+addSbtPlugin("com.typesafe.sbt"  % "sbt-native-packager" % "1.6.1")
 addSbtPlugin("com.eed3si9n"      % "sbt-assembly"        % "0.14.10")
 addSbtPlugin("com.eed3si9n"      % "sbt-buildinfo"       % "0.9.0")
 addSbtPlugin("se.marcuslonnberg" % "sbt-docker"          % "1.5.0")