Merge branch 'master' of https://github.com/utwente-di/di07

Conflicts:
	Ideating/src/main/webapp/comment.jsp
ethics voorlopig
Merge branch 'master' of https://github.com/utwente-di/di07