cleaned server code
Merge branch 'master' of https://github.com/yonromai/aws-js-sdk
resolving conflict