Upgraded query 2.1.1 & backbone 1.1.2
Bug fixes.
Merge branch 'master' into gh-pages