code change at the same time on client.
Merge remote-tracking branch 'origin/master'

* origin/master:
CODE CHANGE FROM WEB GIT HUB

Conflicts:
	api/api readme.txt