Merge remote-tracking branch 'origin/webserver'
partial execute resolved
serializable modif
Merge branch 'master' into webserver

Conflicts:
	webserver/src/main/java/controller/LoginController.java
	webserver/src/main/java/controller/RequestController.java
	webserver/src/main/webapp/request.xhtml
changes taken?
new current webserver branch