fix description
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	composer.json
fix require & site[frontmatter] param