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
bezig met submit test
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
Sprintretrospectives geupload
searchbalkfix?
Fixing layout and adding info/text to website
Merging with Joyce
Fixed links and best.jsp
fixing register
Merge branch 'Iris' of https://github.com/utwente-di/di14 into Iris
Merge branch 'Bas'

Conflicts:
	Code/src/main/java/nl/utwente/thinktank/formHandlers/Rating.java
	Code/src/main/webapp/pages/idea.jsp
Merge branch 'Joyce'

Conflicts:
	Code/src/main/webapp/pages/best.jsp
	Code/src/main/webapp/pages/index.jsp
	Code/src/main/webapp/pages/kvk.jsp
	Code/src/main/webapp/pages/new.jsp
	Code/src/main/webapp/pages/profile.jsp
	Code/src/main/webapp/pages/submit.jsp