Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	.idea/dictionaries/ubt.xml
#	.idea/encodings.xml
#	.idea/inspectionProfiles/Project_Default.xml
#	.idea/inspectionProfiles/profiles_settings.xml
#	.idea/misc.xml
#	.idea/modules.xml
#	.idea/py1.iml
#	.idea/vcs.xml
#	shizhan/jingdong/file/360.csv
#	shizhan/jingdong/file/APPLE.csv
#	shizhan/jingdong/file/COOLPAD.csv
#	shizhan/jingdong/file/DAXIAN.csv
#	shizhan/jingdong/file/GIONEE.csv
#	shizhan/jingdong/file/HAIER.csv
#	shizhan/jingdong/file/HISENSE.csv
#	shizhan/jingdong/file/HTC.csv
#	shizhan/jingdong/file/HUAWEI.csv
#	shizhan/jingdong/file/KONKA.csv
#	shizhan/jingdong/file/LENOVO.csv
#	shizhan/jingdong/file/LETV.csv
#	shizhan/jingdong/file/LG.csv
#	shizhan/jingdong/file/MEIZU.csv
#	shizhan/jingdong/file/MI.csv
#	shizhan/jingdong/file/MOTOROLA.csv
#	shizhan/jingdong/file/NUBIA.csv
#	shizhan/jingdong/file/OPPO.csv
#	shizhan/jingdong/file/PHILIPS.csv
#	shizhan/jingdong/file/SAMSUNG.csv
#	shizhan/jingdong/file/SONY.csv
#	shizhan/jingdong/file/TCL.csv
#	shizhan/jingdong/file/UNISCOPE.csv
#	shizhan/jingdong/file/VIVO.csv
#	shizhan/jingdong/file/ZTE.csv
#	shizhan/jingdong/jd_build_csv.py

first

proxy