Changed external queries support to jquery
Merge branch 'master' into live-coding-start