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
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"
Update documentation/manual/javaGuide/tutorials/zentasks/JavaGuide1.md
Create evolutions_* tables only if needed (If there is any evolution script for the given database).
Merge pull request #726 from kolen/patch-1

(documentation) Fixed broken link to Spring documentation
Update documentation/manual/javaGuide/tutorials/zentasks/JavaGuide2.md

(documentation) Incorrect (relative) link to the test-data.yml file in the Java Zentasks tutorial. The file is needed for the subsequent test "fullTest" to pass correctly.
Merge pull request #698 from mandubian/json-macro-ext

Json macro correction + Json.prettyPrint
Revert "Removed MissingFilePart"

This reverts commit 5106486321918369b8231ee08c3715453c80ea7b.
Merge pull request #751 from javaHelena/patch-2

Update documentation/manual/javaGuide/tutorials/zentasks/JavaGuide2.md
Merge pull request #734 from sgougi/patch-3

Update documentation/manual/Modules.md
Merge pull request #748 from javaHelena/patch-1

Update documentation/manual/javaGuide/tutorials/zentasks/JavaGuide1.md
Merge pull request #750 from guillaumebort/lazyEvolutions

Create evolutions_* tables only if needed (If there is any evolution script for the given database).
Specify alternative default options for `javacOptions` for the doc axe. (these options are actually passed to `javadoc`)
Merge pull request #756 from guillaumebort/fixJavadocOptions

Specify alternative default options for `javacOptions` for the doc axe.