[#1706] Changed HashMap to use a thread safe wrapper.
[#1689] avoid out-of-memory when bytecache file is corrupted
Merge pull request #632 from mkurz/lighthouse-1697-patch

[#1697] Date format() java extension should honor current locale
Merge pull request #633 from mkurz/lighthouse-974-patch

[#974] String.format uses current locale for message formatting
[#1695] Fallback when retrieving messages
        (changed messages files since includes are not supported yet in 1.2.x)
[#1695] Fallback when retrieving messages
        (changed messages files since includes are not supported yet in 1.2.x)
[#1723] fixed formatString regression introduced in [#1716]
Conflicts:
	framework/src/play/i18n/Messages.java