Update from upstream repo

 * Implements paging so we just have to add setPerPage() to our api call in the controller