updated app.js and client side js files
merge