Revert changes to third_party code in favor of extending ClosureTemplateViewResolver.
Add getter for user id.
CSRF protection framework.
Merge branch 'master' of https://github.com/pobrienjhu/ase_w4156.git

Conflicts:
	ASE -
TeamProject/src/java/edu/columbia/ase/teamproject/persistence/domain/UserAccount.java