fixed server.js and issues in other files
Merge remote-tracking branch 'openshift_serv/master'