updates to app js
merge with master