Busy with search, commit for merge
Merge fix search
dingen oa logout
Search now works without categories
Cleaning up code
Merge branch 'Iris' into Jeroen

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/database/Connect.java
Fixed footer, links search.html to search.jsp, fixed search layout
Added Log Out
Merge branch 'Sophie'
Merge branch 'Jeroen'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Contact.java
	Code/src/main/webapp/WEB-INF/web.xml
	Code/src/main/webapp/pages/index.jsp
	Code/src/main/webapp/pages/kvk.jsp
	Code/src/main/webapp/pages/search.jsp
	Code/src/main/webapp/pages/userideas.jsp