Update
Merge branch 'master' of github.com:laruence/php-yaf-doc

Conflicts:
	zh/yaf-bootstrap-abstract.xml