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

Conflicts:
	tn.edu.esprit.piDev.artOfDev.liveUp/ejbModule/tn/edu/esprit/piDev/artOfDev/liveUp/services/B.java