6-6 spam+submit
Fixing Joyce's git
Fixed issues with the merge, swapped emaillogin an pwlogin in login.jsp
Fixing ferication
Merge branch 'Sophie' into Jeroen
Merge branch 'Joyce' into Jeroen

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/CategoryChecker.java
Merge branch 'Bas' into Jeroen
Changes in the layout and some changes in the post functionality
Major rebase
Merge branch 'Bas' into temp_branch

Conflicts:
	Code/12345.jsp
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/newPost2.java
	Code/src/main/webapp/12345.jsp
	Code/src/main/webapp/15128.jsp
	Code/src/main/webapp/38.jsp
	Code/src/main/webapp/submit.jsp
	Code/src/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF
	Code/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
	Code/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
	Code/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
	Code/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
	Code/target/surefire-reports/TEST-nl.utwente.thinktank.database.DatabaseConnectionTest.xml
	Code/target/surefire-reports/TEST-nl.utwente.thinktank.formHandlers.LoginTest.xml
	Code/target/surefire-reports/nl.utwente.thinktank.database.DatabaseConnectionTest.txt
	Code/target/surefire-reports/nl.utwente.thinktank.formHandlers.LoginTest.txt
fixed html errors in jsp files
Merge branch 'Bas'
Merge branch 'Sophie'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/CategoryChecker.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/good.txt
Merge branch 'Jeroen'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/CategoryChecker.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/ExternalRegister.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/UTRegister.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/Bayesian.java
	Code/src/main/java/nl/utwente/thinktank/spamFilter/SpamFilter.java
	Code/src/main/webapp/register.jsp