--
Merge branch 'master' of https://github.com/LeonhardtDavid/scala-jsonwebtoken

Conflicts:
	build.sbt
	src/main/scala/scala/jsonwebtoken/JWT.scala