new query.js
Merge branch 'jay/20131024_1'