proxy测试用例

proxy测试用例
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/lib/utilsSpec.coffee