deleting one more file from js folder...
merging in changes from master