fixing stuff in order to not mess drupal idea of jquery compatibility
Merge branch 'master' into gh-pages