Merge branch 'master' of https://github.com/cloudsharl/webot

Conflicts:
	src/test/java/org/thinkingcloud/webot/sina/RequestTest.java
Merge branch 'master' of https://github.com/cloudsharl/webot

Conflicts:
	src/test/java/org/thinkingcloud/webot/sina/RequestTest.java