no message
Merge branch 'master' of https://github.com/WebArena/ClemWeb_ANNUAIRE

Conflicts:
	README.md
	app/ajax/back/manager.php
	app/css/back/annuaire.css
	app/css/front/annuaire.css
	app/javascript/back/annuaire.js
	app/javascript/front/annuaire.js
	app/templates/back/cards.html
	app/templates/back/createCard.html
	app/templates/back/index.html
	app/templates/front/category.html
	app/templates/front/createCard.html
	app/templates/front/detail.html
	app/templates/front/editCard.html
	app/templates/front/index.html
	app/templates/utils/forms.html
	back/cards.php
	back/categories.php
	back/createCard.php
	back/index.php
	back/parameters.php
	back/rss_annuaire.php
	back/widget_cards.php
	config/config.xml
	front/category.php
	front/createCard.php
	front/detail.php
	front/editCard.php
	front/index.php
	front/profile.php
	front/rss.php
	lib/annuaire.class.php