Inlog server
Merge branch 'master' of https://github.com/utwente-di/di02

Conflicts:
	werkende versie
workspace/flatportal-final/target/m2e-wtp/web-resources/META-INF/MANIFES
T.MF