Merge branch 'master' of
https://github.com/androidzhaoxiaogang/rocket.git

Conflicts:
	src/fast/rocket/Rocket.java
	src/fast/rocket/builder/RocketRequestBuilder.java
Merge branch 'master' of
https://github.com/androidzhaoxiaogang/rocket.git