Simplifying the test code a bit.
Converts values of type Any to JValue if there is a FieldSerializer available.
Merge branch '2.3.x_2.10' of github.com:scalatra/scalatra into 2.3.x_2.10

Conflicts:
	json/src/main/scala/org/scalatra/json/JValueResult.scala
Patch for #416

Multiple AtmosphereResources in a single HttpSession are collapsed to a single AtmosphereResource when broadcasting

Signed-off-by: psi <ledyba@users.sourceforge.jp>
Merge pull request #421 from ledyba/2.3.x

Patch for #416
Bump sbt from 0.13.2 to 0.13.6
Add Travis CI settings
Bumped minor versions of libraryDependencies, add dependencyOverrides for scala-lang deps
Merge pull request #423 from seratch/feature/sbt-0.13.6

Bump sbt from 0.13.2 to 0.13.6
Merge pull request #424 from seratch/feature/travis

Add Travis CI settings
Merge pull request #425 from seratch/feature/deps-minor-updates

Bumped minor versions of libraryDependencies, add dependencyOverrides for scala-lang deps
Fix some TODO in build settings

 - Remove ls-sbt (https://github.com/scalatra/scalatra/pull/423 )
 - Note about scalaz-7.0.x compatibility (https://github.com/scalatra/scalatra/pull/425)
 - Back to Scala 2.11.2 for now
Merge pull request #426 from seratch/feature/fix-build-settings

Fix some TODO in build settings
Bump sbt from 0.13.2 to 0.13.6

Conflicts:
	project/build.scala
Add Travis CI settings
Bumped minor versions of libraryDependencies, add dependencyOverrides for scala-lang deps

Conflicts:
	project/build.scala
Fix some TODO in build settings

 - Remove ls-sbt (https://github.com/scalatra/scalatra/pull/423 )
 - Note about scalaz-7.0.x compatibility (https://github.com/scalatra/scalatra/pull/425)
 - Back to Scala 2.11.2 for now

Conflicts:
	project/build.scala
Made basic scalatra-atmosphere test working.
Reverted json test for now.
Merge pull request #428 from dozed/atmosphere-test

Made atmosphere test working again.