Signed-off-by: Amoula <Amoula@Amoula-PC>
Merge branch 'master' of
ssh://git@github.com/amal-gsm/repoOfOurClass.git

Conflicts:
	tn.edu.espritEntreprise.smartModuleManagementEJB/ejbModule/tn/edu/espritEntreprise/smartModuleManagementEJB/services/AmalClass.java