AJout de la gestion des mots composés
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	src/search.rb
	web/views/search.haml
Merge remote-tracking branch 'origin/unstable'

Conflicts:
	web/views/search.haml