rename project
Merge branch 'master' of git@github.com:utwente-di/di20.git

Conflicts:
	.settings/org.eclipse.wst.common.component
	src/main/java/di20/rooster/AuthenticationFilter.java
	src/main/webapp/editSelf.jsp