Merge branch 'master' of https://github.com/genkgo/api-docs.git

Conflicts:
	organization.md
Merge branch 'master' of https://github.com/genkgo/api-docs.git