【Server】配置相关
Merge branch 'master' of https://github.com/kunhuang/Second-Hand-Platform

Conflicts:
	Server/json_api/views.pyc