corrected Json macro for companion object & single-field case classes
added Json.prettyPrint & doc & cosmetics
cosmetics
Json.prettyPrint scaladoc/doc
[#962] Fix Json Reads.reducer to use JsObject.deepMerge instead of ++
Update documentation/manual/scalaGuide/main/json/ScalaJsonCombinators.md

doc correction: can't tuple-combine Writes on JsArray
Make lookup of scala-library.jar and scala-compiler.jar more robust
Fixed broken link to Spring documentation

Fixed broken link to Spring documentation at static.springsource.org (old path contained /html/, removed).
Update documentation/manual/Modules.md

- Moved "Origami" to the right position
- Added "TinkerPop Frames Plugins"
Don't include compiled assets in "watchSources" by default
Adding mime types to ttf fonts
fix the issue that Helpers.route is implemented improperly.
cause MatchError if unmatch
Update samples/java/comet-clock/app/controllers/Application.java

even if it's just a simple sample i find this fix important because it's a common bug.
Merge pull request #742 from jackganzha/mimeTypes

Issue #993 - Adding mime types to ttf fonts
Merge pull request #727 from gseitz/topic/ticket-944

Ticket-944: Make lookup of scala-library.jar and scala-compiler.jar more robust
[#751] Changed DEFAULT_MAX_LENGTH to def
[#736] Trim accept encoding fields before checking for gzip
Merge pull request #743 from sunny4381/fix-java-helpers-route

Issue #984 - fix improper play.test.Helpers.route implementation
[#964] Ensured fake request maintains query parameters when adding a body