add email column to users table, tried to add email system, but not working
Merge commit 'f1e4fc8459d5189048698f60ba54bc22dd9fe8f7'

* commit 'f1e4fc8459d5189048698f60ba54bc22dd9fe8f7':
  Add sign up tests
  Remove unneeded specs
  Include Capybara::DSL

Conflicts:
	app/views/users/show.html.haml
separate team assignment from students index, fix "add to team", and add delete students to students index
make changes to team calendar and work track page, but fix needed for page redirect if the task was deleted.
create new student/sponsor with new user created, but still have bugs in them
fix error in create student/sponsor
add year to semester
modify preference page (apply, all pages) and project index page