Merged js
updated janitor