client controller modified
add: client requests in ClientRequestManager
Conflicts Merge:
	server/src/server/ClientRequestManager.java
add: client requests in ClientRequestManager
Conflicts Merge:
	server/src/server/ClientRequestManager.java