First commit.
This merge affects models sign_up_topic and signed_up_user.

Merge branch 'master' of github.com:hgupta2/Expertiza611a into e611

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/controllers/assessment360_controller.rb
	app/controllers/assignment_controller.rb
	app/controllers/auth_controller.rb
	app/controllers/grades_controller.rb
	app/controllers/profile_controller.rb
	app/controllers/questionnaire_controller.rb
	app/controllers/response_controller.rb
	app/controllers/review_mapping_controller.rb
	app/controllers/sign_up_sheet_controller.rb
	app/controllers/student_review_controller.rb
	app/controllers/student_task_controller.rb
	app/controllers/student_team_controller.rb
	app/controllers/submitted_content_controller.rb
	app/helpers/application_helper.rb
	app/helpers/dynamic_review_mapping.rb
	app/helpers/grades_helper.rb
	app/models/assignment.rb
	app/models/assignment_participant.rb
	app/models/assignment_team.rb
	app/models/due_date.rb
	app/models/leaderboard.rb
	app/models/metareview_response_map.rb
	app/models/participant.rb
	app/models/response.rb
	app/models/response_map.rb
	app/models/review_response_map.rb
	app/models/score.rb
	app/models/score_cache.rb
	app/models/sign_up_topic.rb
	app/models/signed_up_user.rb
	app/views/assessment360/all_assignments_all_students.html.erb
	app/views/assessment360/one_assignment_one_student.html.erb
	app/views/assessment360/one_course_all_assignments.html.erb
	app/views/assignment/_content.html.erb
	app/views/assignment/_due_dates.html.erb
	app/views/assignment/_rubrics.html.erb
	app/views/assignment/edit.html.erb
	app/views/grades/_participant.html.erb
	app/views/grades/_participant_title.html.erb
	app/views/grades/_reviews.html.erb
	app/views/grades/_submissions.html.erb
	app/views/grades/view.html.erb
	app/views/grades/view_my_scores.html.erb
	app/views/menu_items/_breadcrumbs.html.erb
	app/views/menu_items/_menubar.html.erb
	app/views/menu_items/_suckerfish.html.erb
	app/views/response/response.html.erb
	app/views/response/view.html.erb
	app/views/review_mapping/_list_review_mappings.html.erb
	app/views/review_mapping/select_metareviewer.html.erb
	app/views/sign_up_sheet/_table_header.html.erb
	app/views/sign_up_sheet/_topic.html.erb
	app/views/sign_up_sheet/add_signup_topics.html.erb
	app/views/sign_up_sheet/add_signup_topics_staggered.html.erb
	app/views/sign_up_sheet/signup_topics.html.erb
	app/views/sign_up_sheet/view_publishing_rights.html.erb
	app/views/student_review/_responses.html.erb
	app/views/student_task/list.html.erb
	app/views/student_task/others_work.html.erb
	app/views/student_task/view.html.erb
	app/views/submitted_content/_mediawiki.html.erb
	app/views/tree_display/actions/_assignments_actions.html.erb
	config/cucumber.yml
	config/database.yml
	config/deploy.rb
	config/environment.rb
	config/environments/development.rb
	config/initializers/request_forgery_protection_mod.rb
	db/User.yml
	db/migrate/110_create_assignment_questionnaires.rb
	db/schema.rb
	features/admin/edit_instructor.feature
	features/instructor/manage_questionnaires.feature
	features/step_definitions/authentication_steps.rb
	features/step_definitions/create_instructor.rb
	features/step_definitions/create_questionnaire.rb
	features/step_definitions/create_team_assignment_add_participants.rb
	features/step_definitions/manage_assignments_steps.rb
	features/step_definitions/manage_courses_steps.rb
	features/step_definitions/manage_review_steps.rb
	features/step_definitions/review_others_work.rb
	features/step_definitions/suggesting_topics.rb
	features/step_definitions/user_management_steps.rb
	features/student/login.feature
	features/student/view_leaderboard.feature
	public/.htaccess
	public/javascripts/application.js
	script/about
	script/console
	script/cucumber
	script/dbconsole
	script/destroy
	script/generate
	script/performance/benchmarker
	script/performance/profiler
	script/plugin
	script/runner
	script/server
	test/fixtures/assignment_questionnaires.yml
	test/fixtures/assignments.yml
	test/fixtures/controller_actions.yml
	test/fixtures/deadline_types.yml
	test/fixtures/due_dates.yml
	test/fixtures/participants.yml
	test/fixtures/question_types.yml
	test/fixtures/questionnaires.yml
	test/fixtures/questions.yml
	test/fixtures/response_maps.yml
	test/fixtures/responses.yml
	test/fixtures/scores.yml
	test/fixtures/signed_up_users.yml
	test/fixtures/site_controllers.yml
	test/fixtures/teams.yml
	test/fixtures/teams_users.yml
	test/functional/assignment_controller_test.rb
	test/functional/review_mapping_controller_test.rb
	test/unit/assignment_participant_test.rb
	test/unit/assignment_test.rb
	test/unit/score_test.rb
	test/unit/score_view_test.rb
	vendor/gems/hoptoad_notifier-2.4.4/script/integration_test.rb
Merge branch 'master' into e611