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.