C4 Update
Merge branch 'develop' of github.com:yinqiwen/gsnova into develop

Conflicts:
	src/proxy/c4.go
C4 Update