updated js frameworks
merged