Fixing External Register
checkboxsubmit
Want checkout conflict
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/testCode/test.java
Merging with Joyce
Trying to fix git
versie Joyce 12-6
submit ccheck
Creating quarantaine
Fixing things after faults in branch Joyce
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce

Conflicts:
	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/spamFilter/Bayesian.java
	Code/src/main/webapp/login.jsp
Merge branch 'Joyce' into Jeroen

Conflicts:
	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/spamFilter/Bayesian.java
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce
Joyce 12-6
Merging with Joyce
External Register without success message and trying to fix submit with Joyce
Joyce 18-6
Fixed mail import and something else ...?
update vote-sql
rating system