merge
Merge branch 'master' of https://github.com/RodolpheFreby/MobilAgent.git

Conflicts:
	src/jus/aor/mobilagent/kernel/Server.java