Merge branch 'master' into dev
added jquery
Merge remote-tracking branch 'origin/dev'