remove unused macro
rename a twig file according to his real purpose
add removed file to commit :)
set syllable to null if empty string
Merge pull request #625 from arnaudbey/fixes

Fixes