Remove use of Epoch and outdated comment.
Fix copy paste error.
Merge branch 'master' of ssh://github.com:22/pobrienjhu/ase_w4156
Remove Timezone
Add logout functionality.
Style fix.
Test for event creation with voting categories.
Merge branch 'master' of ssh://github.com:22/pobrienjhu/ase_w4156

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