Signed-off-by: Malek <malekelones.benamor@esprit.tn>
Merge branch 'master' of
ssh://git@github.com/malekelons/Electronic-Voting-Platform.git

Conflicts:
	edu.esprit.electronicVotingEJB/ejbModule/META-INF/persistence.xml