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

Conflicts:
	src/main/webapp/editEmployee.jsp
fix user change