rename REST_PORT to PORT
remove redundant rest headers
fix typo in server.js
Merge branch 'master' into staging