paging buttons CSS fix
Allow berkeley.edu users to get to dashboard
resolve merge
resolve merge conflict