Merge
add other website js
bugfix