5
Merge branch 'master' of github.com:ShopEx/bbc-doc

Conflicts:
	agreement/convention.md