updating server and script files
Merge branch 'master' of https://github.com/kohlerjp/tokenTank