added jquery
Merge origin/master