Permissions, logout
Merge branch 'master' of git@github.com:utwente-di/di20.git

Conflicts:
	src/main/java/di20/rooster/LoginServlet.java
	src/main/webapp/includes/header_c.jsp
	src/main/webapp/includes/header_d.jsp