Updated jQuery dependency to 1.11.1
Merge conflict; updated jQuery dependency