Merge branch 'master' of https://github.com/yoshow/x-client-api

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/yoshow/x-client-api

Conflicts:
	readme.txt