Fix https://bugzilla.mozilla.org/show_bug.cgi?id=825803
Merge branch 'master' of git://github.com/mozilla/addon-sdk.git into properties-json-unicode-fix
Merge pull request #724 from brettz9/properties-json-unicode-fix

Bug 825803 - SDK Locale double-escaping Unicode sequences r=@ochameau