support server multi password, support client multi server
Merge pull request #79 from v3aqb/multi_port

support server multi password, client multi server
Merge remote-tracking branch 'upstream/master'

Conflicts:
	shadowsocks/local.py