changes app js file
merges with vps
adds changes from vps
fixes merge conflicts