edit api
Merge branch 'master' of github.com:zhwei/zhengfang

Conflicts:
	doc/api.md