Signed-off-by: aya <aya@172.16.163.43>


Signed-off-by: aya <aya@172.16.163.43>


Signed-off-by: aya <aya@172.16.163.43>


Signed-off-by: aya <aya@172.16.163.43>
Merge branch 'master' of ssh://git@github.com/seifboujemaa/piDevRepo.git

Conflicts:
	tn.edu.esprit.pidev.artofdev.liveup.client/appClientModule/tn/edu/esprit/pidev/artofdev/liveup/client/delegate/AddReporterServicesDelegate.java
	tn.edu.esprit.pidev.artofdev.liveup.client/appClientModule/tn/edu/esprit/pidev/artofdev/liveup/client/delegate/GameServicesDelegate.java
	tn.edu.esprit.pidev.artofdev.liveup.client/appClientModule/tn/edu/esprit/pidev/artofdev/liveup/client/delegate/StadiumServicesDelegate.java
	tn.edu.esprit.pidev.artofdev.liveup.client/appClientModule/tn/edu/esprit/pidev/artofdev/liveup/client/delegate/TeamServicesDelegate.java
	tn.edu.esprit.pidev.artofdev.liveup.ejb/ejbModule/tn/edu/esprit/pidev/artofdev/liveup/ejb/services/user/UserServices.java
	tn.edu.esprit.pidev.artofdev.liveup.ejb/ejbModule/tn/edu/esprit/pidev/artofdev/liveup/ejb/services/user/UserServicesLocal.java
	tn.edu.esprit.pidev.artofdev.liveup.ejb/ejbModule/tn/edu/esprit/pidev/artofdev/liveup/ejb/services/user/UserServicesRemote.java