Update vote page, and timer management.
Merge branch 'admin-user-management'

Conflicts:
	exceedvote/app/controllers/Vote.java
	exceedvote/conf/routes