Merge branch 'master' of github.com:dian4554/rax-api-ref

Conflicts:
	README.md
Merge branch 'master' of github.com:dian4554/rax-api-ref