search en rating
restful services
searchCatPost
Preparing to switch branches
Fixing spam.txt
Fixed spamFilter
spamfilter en search
search test en andere tests
Added a profile page, implemented paramaters in the URL in several pages
search.jsp fix
Re-enabeld quarantaine, fixed Credentials
Merge branch 'Bas'

Conflicts:
	Code/src/main/webapp/WEB-INF/web.xml
	Code/src/main/webapp/login.jsp
	Code/src/main/webapp/register.jsp
	Code/src/main/webapp/site/9.jsp
	Code/src/main/webapp/site/idea.jsp
	Code/src/main/webapp/site/index.png
	Code/src/main/webapp/site/kvk.png
	Code/src/main/webapp/site/logo.png
	Code/src/main/webapp/site/logoUT.png
	Code/src/main/webapp/site/new.png
	Code/src/main/webapp/site/popular.png
	Code/src/main/webapp/site/search.png
	Code/src/main/webapp/site/submit.png
	Code/src/main/webapp/site/teamlogo.png
	Code/src/main/webapp/site/test.png
Merge branch 'Iris'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/database/Connect.java
	Code/src/main/java/nl/utwente/thinktank/types/UserData.java
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SearchTest.java
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SubmitTest.java
Merge branch 'Sophie'

Conflicts:
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SearchTest.java
Merge branch 'Joyce'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Rating.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Search.java
	Code/src/main/webapp/site/search.jsp
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SearchTest.java
	Code/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst