Update java7 to 1.7.0_60
Merge pull request #282 from faun/master

Update java7 to 1.7.0_60