ㅎㅎㅎ
Merge branch 'master' of git@github.com:y30435/ganzi.git

Conflicts:
	src/main/java/com/ganzi/service/HttpNetworkService.java