jQuery conflict
Merge branch 'master' of ssh://github.com/aube/js