on update & on delete cascade
Merge branch 'master' of https://github.com/utwente-di/di14
fixed small issues
fixed more small issues
Merge branch 'Joyce'

Conflicts:
	Code/src/main/webapp/pages/idea.jsp
	Code/src/main/webapp/pages/index.jsp
	Code/src/main/webapp/pages/search.jsp
Merge branch 'Jeroen'

Conflicts:
	Code/src/main/webapp/pages/idea.jsp
	Code/src/main/webapp/pages/index.jsp