add proxy setting on non windows systems
pickup new kr support #11
Merge branch 'dev' of git@github.com:fffonion/MAClient.git into dev
Merge branch 'dev' of github.com:fffonion/MAClient into dev

Conflicts:
	maclient_network.py
fix auto_set fairy arg
set title on xterm compat shell
update cn
Merge branch 'dev' into dev_web

Conflicts:
	maclient.py