2-2, Add button organizer
Signed-off-by: Yoann SOLACROUP <solacroup.yoann@gmail.com>
Show add friend only when you actualy can
Merge branch '1-3' into dev
Merge remote-tracking branch 'origin/dev-2-1' into dev

Conflicts:
	www/templates/event/card.html
	www/templates/event/comment.html