added lib files
added js
merge