Fixed some issues with the merge, now added votehistory.jsp