Fixed registartion
Fixed some issues with the merge, now added votehistory.jsp
Merge branch 'Bas'
Merge branch 'Sophie'

Conflicts:
	Code/src/main/webapp/pages/best.jsp
	Code/src/main/webapp/pages/idea.jsp
	Code/src/main/webapp/pages/index.jsp
	Code/src/main/webapp/pages/new.jsp
	Code/src/main/webapp/pages/submit.jsp
	Code/src/main/webapp/register.jsp