Update from upstream repo

 * Implements paging (among a lot of other fixes) so we just have to add setPerPage() to our api call in the controller to get all our branch listings back.