Merge branch 'master' of ssh://git@github.com/gregorybesson/AdfabFaq.git

Conflicts:
	composer.json
Merge branch 'master' of ssh://git@github.com/gregorybesson/AdfabFaq.git