updated jquery link
merged changes