Merge pull request #2316 from fernandoacorreia/typo-contraint

Fix typo "contraint"
Update OpenID usage example in Scala to Play 2.2
Merge pull request #2322 from mkiedys/master

Update OpenID usage example in Scala to Play 2.2
small typo fixed
Fix implicitNotFound documentation for Writes and Json.toJson/fromJson.
Merge pull request #2320 from cchantep/anorm-strinter

Refactor/optimize string interpolation
Merge pull request #2324 from swiety/master

small typo fixed
Merge pull request #2327 from drstevens/fix-writes-documentation

Fix implicitNotFound documentation for Writes and Json.toJson/fromJson.
Taking 2.10.4-RC2 for a spin
[doc] Update the maximum content length docs

Also add a reference to the Configuration page for unit sizes.
[doc] Add full nginx.conf in HTTPServer

Previous version was not runnable.  Commented out SSL section, and updated the cipher / protocol list based off bettercrypto.org.
Update fluentlenium to 0.9.2
Update JavaGuide2.md

Corrected misspelling of 'Tthat' to 'That'
Added containsHeader to Http.RequestHeader.  Clarified case-insensitivity of getHeader.
Merge pull request #2330 from wsargent/fix-2330

Firefox 26 does not work with fluentlenium 2.33
Ensured all java enhanced classes are updated in cache

Since the Scala incremental compiler also does incremental compilation
for Java sources, when they are touched by the properties enhancer the
cache also has to be updated for them.
Merge pull request #2347 from jroper/inc-java-accessors

Ensured all java enhanced classes are updated in cache
Don't concatenate js files

Fixes #2192.

Let me start by saying I don't 100% understand our existing commonjs
support, what it's supposed to do etc.  This PR maintains the old
behaviour when the `commonJs` flag is supplied.  For some reason, the
commonjs support would pass in all siblings of a js file.  It would then
convert them to commonjs modules, namespacing them.  It would then
process all dependencies, and include all the dependencies.  For the
average project that didn't use commonjs, this meant that nothing got
included because there weren't any require statements.

But then we changed it to disable commonjs support by default, which
turned off this auto commonjs namespacing thing, and for some reason
that meant that the closure compiler just decided to concatenate all the
input files.

So, what this does, is when when commonJs is not enabled, it doesn't
pass all the siblings in as input files, it just passes the one input
file.  This stops the concatenation from happening.
Merge pull request #2335 from wsargent/patch-3

[doc] Add full nginx.conf in HTTPServer
Changed containsHeader in Http.RequestHeader to hasHeader.  Moved case-insensitive comment to headerName param doc.