Fix order of arguments to constructor.
Merge branch 'master' of ssh://github.com:22/pobrienjhu/ase_w4156
Don't use token name as displayName due to length issues.
Remove commented brace.
Serialize/deserialize event type.
Update role names in tests.
Fix role names in test SQL.
Refactor to pass creating user to EventDao.
equals/hashcode for persistent class.
Move package to mirror tested class.
Test case to demonstrate deserialization bug.
Merge branch 'master' of ssh://github.com:22/pobrienjhu/ase_w4156

Conflicts:
	ASE - TeamProject/src/java/edu/columbia/ase/teamproject/persistence/domain/Event.java
	ASE - TeamProject/src/java/edu/columbia/ase/teamproject/services/EventService.java