safas
parse uri
Merge branch 'peter'

Conflicts:
	proxy.c