specs2 1.13
fix Modules.md links
Add BigDecimal to the form mapping.
Update Jquery to latest version (1.9.0) in skeletons
Merge pull request #678 from Timshel/wip-bigDecimal

Add BigDecimal to the form mapping.
[#954] Ensured requests are tagged before filters are applied
Merge pull request #693 from jroper/filters-tags

[#954] Ensured requests are tagged before filters are applied
Merge pull request #683 from xuwei-k/specs2-1.13

specs2 1.13
Merge pull request #691 from studiodev/2.1_UPDATE_JQUERY_1.9.0

[#952] Update Jquery to latest version (1.9.0) in skeletons
Merge pull request #687 from xuwei-k/modules

fix Modules.md links
Use scala-io-file v0.4.2 for Scala 2.10

This has been compiled against Scala 2.10.0 final (as has it's
dependency scala-arm v1.3) so the problems from PR #676 are finally laid
to rest :)

Happily, it's no longer necessary to add the javax.transaction
exclusion, as that's been dropped from the list of dependencies of
scala-io.

scala-io v0.4.2 was /only/ published against Scala v2.10 so far as I can
see, so I haven't updated the other build deps of scala-io to it, as
they are still running within SBT at Scala 2.9.2.
bump sbt version in the migration guide
Merge pull request #700 from jamesward/fix/migration-guide

bump sbt version in the migration guide
Merge branch 'master' of https://github.com/playframework/Play20 into TLS

Conflicts:
	framework/src/play-test/src/main/scala/play/api/test/Specs.scala
	framework/src/play/src/main/scala/play/core/server/netty/PlayDefaultUpstreamHandler.scala
	framework/test/integrationtest/test/SslSpec.scala
fix tests from previous merge