yweak: move info in yaml
update: mv includes back to en or fr
Merge branch 'test'

Conflicts:
	_data/rules_en.yml
	en/categories.md
	fr/categories.md
tweak: rendering
clean