Merge branch 'daltonbranch' into c1moore_branch
Added methods to properly select event when changing pages and correct logical error in signin controller.
Fixed conflict