bezig met submit test
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
fixing register
Merge branch 'Iris' of https://github.com/utwente-di/di14 into Iris
deletefix
Added vote history, changed menubar, changed profile box in idea.jsp and rating hover
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
Merge branch 'Sophie'

Conflicts:
	Code/src/main/webapp/pages/best.jsp
	Code/src/test/java/nl/utwente/thinktank/formHandlers/SubmitTest.java
Merge branch 'Joyce' of https://github.com/utwente-di/di14 into Joyce

Conflicts:
	Code/src/main/webapp/login.jsp