[#1684] fix Images.resize, Images.crop: memory leak (imagewriter not disposed)
Improved session and flash cookie encoding
Factored out the cookie data codec and provided tests
 [#1685] make url matching and encoding consistent in router (both working on Encoded values) - use webContentEncoding
[#1587] Fix DB.execute javadoc
[#1689] avoid out-of-memory when bytecache file is corrupted
[#1689] oops. stop reading hash on null byte
Update ide.textile
[#1686] Make Promise.waitAll().get(long, TimeUnit) respect timeout and throw an exception
Revert "[#1014] Merge pull request #307 from nzakas/master"

This reverts commit 7753c9140ef29569bb2e77920a7906605d2ae294.
Merge pull request #633 from mkurz/lighthouse-974-patch

[#974] String.format uses current locale for message formatting
Merge pull request #632 from mkurz/lighthouse-1697-patch

[#1697] Date format() java extension should honor current locale
Merge pull request #624 from hongrich/lighthouse-1692-patch

[#1692] Don't set Content-Length on a 304 response
fixed Redirect test when comparing times
fixed finally test
fixed REST test - do not compare date headers since they can be different
cloudbees CI
[#1315] @InFuture and @InPast now honor date.format in the error message
[#1698] Fix select template tag to allow % and other non-String objects as label

The % character needs to be escaped when used inside a messages tag
(which the #{select} template tag does for label). In addition,
labelProperty can point to a non-String field, so toString should be
called on that before trying to HTML escape it.
[#1699] Stop play netbeansify ignoring framework ID.