using jquery 2.1 instead of jquery-2.2
Merge commit 'bddf801'