Fixed search pagina
Merge branch 'Sophie' of https://github.com/utwente-di/di14 into Sophie
Changed order of 'Mailbox' and 'Voting history' in the navbar
Hopefully fixed ESCAPI error, Jeroen moet het testen want ESCAPI heeft issues bij mij
wat kleine dingen in jsp fixen, oa plaatjes eruit gesloopt
Fixed layout of the Search page
fixed things
Merge branch 'Iris' of https://github.com/utwente-di/di14 into Iris
Merge branch 'Sophie' into Jeroen

Conflicts:
	Code/src/main/webapp/pages/best.jsp