delete-indexfix
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce
Changed navbar, submit navbar not working yet
deletefix?
Merging with Joyce
deletefix
Prepare to merge with Joyce
Merge branch 'Joyce' into Sophie
deletefix
Merge branch 'Joyce' into Sophie
Fixed navbar in submit
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