CLC-1636 - Security Review.4/5 Results
https://jira.media.berkeley.edu/jira/browse/CLC-1636

Conflicts:

	config/routes.rb
[CLC-1636] Fix act_as tests
Merge pull request #934 from ctweney/clc-1636-qa

CLC-1636 QA branch version of CSRF security fixes