Including jquery (in right order) to support tangelo dependence
Merge branch 'fix-jquery-include'
Merge branch 'master' into tangelo-js

Getting fix from fix-jquery-include.