Revert "attempting to make a parent app.js for server and web-client app.js"

This reverts commit 2dd6c32086375be0d2010ba8b7a839061dee4be4.
fixing merge issues