tuesdays
Merge branch 'master' of https://github.com/taiyed/server

Conflicts:
	find_proxy.tmp
ok