Fixed jquery issue
Merge branch 'master' into baas/parse