= Bump up scala-js version to 0.5.4

+ Merge remote-tracking branch 'gh-sirthias/master' into scala-2.11-scalajs-0.5.x

Conflicts:
	build.sbt
	examples/src/main/scala/org/parboiled2/examples/JsonParser.scala