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 ++
Add application/javascript to text types

Javascript code also needs charset HTTP header to correctly use UTF-8 strings. This patch adds 'application/javascript' to list of additional text types in MimeTypes class
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/scalaGuide/main/tests/ScalaFunctionalTest.md

Fixed the example code to compile.
Update documentation/manual/Modules.md

- Moved "Origami" to the right position
- Added "TinkerPop Frames Plugins"
Don't include compiled assets in "watchSources" by default
Update documentation/manual/detailledTopics/build/Build.md

Updating to 2.1.0 play.Project
Update documentation/manual/detailledTopics/build/SBTSettings.md

Updated to play 2.1.0
add additionalImports for routes hash seed
Merge pull request #739 from xuwei-k/additionalImports-hash-seed

add additionalImports for routes hash seed
Merge pull request #733 from mumoshu/patch-1

Update documentation/manual/scalaGuide/main/tests/ScalaFunctionalTest.md
Merge pull request #711 from maxcom/patch-1

Add application/javascript to text types
Adding mime types to ttf fonts
fix the issue that Helpers.route is implemented improperly.