re test br louis
Merge branch 'louis'

Conflicts:
	WebArenaGroupSI4-03-AG/app/View/Arena/character.ctp