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

Conflicts:
	config/module.config.php