Signed-off-by: ghassen ticha <ghassen ticha@ghassen>
Merge branch 'master' of
ssh://git@github.com/ghassenalouini/turnt-archer.git

Conflicts:
	tn.edu.esprit.infini.theWolves.tvForExWeb/WebContent/Pages/Platfrom/Register.xhtml
	tn.edu.esprit.infini.theWolves.tvForExWeb/WebContent/Pages/Platfrom/Template/TemplateAdmin.xhtml
	tn.edu.esprit.infini.theWolves.tvForExWeb/src/tn/edu/esprit/infini/theWolves/tvForExWeb/classes/RegisterBean.java