IntelliJ file update.
More IntelliJ updates. Should I be committing these or what?
Get charset from encoding for date format using Java utils.

Fixes #1128.
Set parent of Java inner class to outer class proxy. Fixes #1117.
Merge branch 'jruby-1_7'