updated trunk js
merging changes