Update markdown : upstream + feature
Fix smarty use
Merge pull request #623 from zestedesavoir/update_markdown

Update markdown : upstream + feature