Modify client and server scripts to use new jar name
Merge remote-tracking branch 'origin/master'