sync
Merge branch 'master' of http://git.op.ksyun.com/juxuejian/fe-server
update: sync
把资源优化功能集成进amazing
Merge branch 'master' of http://git.op.ksyun.com/juxuejian/fe-server

Conflicts:
	amazing