Rename app.js to script.js for java server
Merge remote-tracking branch 'upstream/master'