Merge branch 'master' of https://github.com/izerocrazy/GoServer

Conflicts:
	src/HttpG/2.txt
	src/HttpG/3.txt