Seb: Ajout des fragments nous_rejoindre
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetAIFCC2014/res/values/strings.xml