Merge pull request #34 from iptton/master

MacOS版 完善设置代理功能
修复linux编译, 临时禁用自动代理设置pac
修复一处翻译错误
添加条件编译，暂时禁用Linux下的PAC
Merge pull request #38 from lizaifang/master

 修正Linux下编译，禁用自动代理设置，修复一处错别字
merge iptton
PAC relate
Merge branch 'master' of https://github.com/iptton/Rythem

Conflicts:
	main.cpp
	mainwindow.cpp
	proxy/rypipedata.cpp
	proxy/rypipedata.h
	rythem_zh_CN.ts