Merge pull request #1061 from jamierumbelow/develop

Renamed Active Record class to Query Builder