changed location of java download
Merge remote-tracking branch 'origin/master'