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
delete/searchfix
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce
wat kleine dingen in jsp fixen, oa plaatjes eruit gesloopt
searchfix
Fixed layout of the Search page
fixed things
Changed some things in idea.jsp
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
Fixed ESAPI
Merge branch 'Joyce'

Conflicts:
	Code/src/main/webapp/pages/idea.jsp
	Code/src/main/webapp/pages/index.jsp
	Code/src/main/webapp/pages/kvk.jsp
	Code/src/main/webapp/pages/new.jsp
	Code/src/main/webapp/pages/profile.jsp
	Code/src/main/webapp/pages/search.jsp
	Code/src/main/webapp/pages/submit.jsp
	Code/src/main/webapp/pages/votehistory.jsp
Merge branch 'Bas'

Conflicts:
	Code/src/main/webapp/pages/idea.jsp
Merge branch 'master' of https://github.com/utwente-di/di14