Cotation finished

Signed-off-by: ayoublahouimel <ayoublahouimel@ayoubs-mbp.esprit.tn>
Merge branch 'master' of
https://github.com/ghassenalouini/turnt-archer.git

Conflicts:
	tn.edu.esprit.infini.theWolves.tvForEx/ejbModule/tn/edu/esprit/infini/theWolves/tvForEx/facadeLocal/impl/CotationFacade.java
	tn.edu.esprit.infini.theWolves.tvForEx/ejbModule/tn/edu/esprit/infini/theWolves/tvForEx/facadeRemote/impl/CotationFacadeImpl.java