Api upgrades, querybuilder, jsoncollection fix
Everything in one file, without includes