Rename app.js to server.js
Merge branch 'develop'
Rename app.js to server.js