Code opschonen
Merge conflict
Merge branch 'Sophie' of https://github.com/utwente-di/di14 into Sophie

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java
cookiefix
cookiefix versie2
Added documentation
ratingfix
deleteknop
Merge branch 'Iris'
Merge branch 'Sophie'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Rating.java
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Submit.java