merging app.js changes
merged changes in app + testvis