Removed attr_accessible from our mass assignment models
Removed tests against mass assignment in models
Modified effort_logs_controller_spec to not feed effort_logs a sum directly
In process of writing mass assignment test for jobs
Added cocaine gem
Resolved errors in staged branch. Installed strong_parametes gem
Merge branch 'staged' into mass_assignment

Conflicts:
	Gemfile
	Gemfile.lock
Protected job_supervisors from mass assignment,
test is incomplete
Removed jobs_controller_spec
Build is currently broken
Protected job_employees and job_supervisors from mass assignment
Note: I don't think this protects job_employee's job_id
needs further investigation
Protected effort_log_line_items from mass assignment. Weeee!
Protected effort_logs from mass assignment
Protected job_employees and job_supervisors from mass assignment.
Fixed a bug in jobs controller: can now remove ALL employees
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into staged

Conflicts:
	Gemfile
	app/controllers/application_controller.rb
	spec/features/grading_queue_sort_by_task_spec.rb
Merge branch 'mass_assignment' into staged

Conflicts:
	app/controllers/application_controller.rb
	spec/features/grading_queue_spec.rb
teams.rb fixed
Pulled and merged staged branch
Gemfileand Gemfile.lock updates
strong_parameters and cocaine added
Merge branch 'staged' of https://github.com/Gonghan/whiteboard into Staged

Pulling the latest working build from stage