Merge branch 'master' of https://github.com/HeraldStudio/webservice-py

Conflicts:
	herald_web_service/tyx_service/README.md
Merge branch 'master' of https://github.com/HeraldStudio/webservice-py

Conflicts:
	herald_web_service/tyx_service/README.md