Update Java version to 1.7
Merge