final
Merge branch 'master' of
ssh://git@github.com/ghassenalouini/turnt-archer.git

Conflicts:
	tn.edu.esprit.infini.theWolves.tvForEx/ejbModule/META-INF/persistence.xml
bjr