reverse proxy
Merge branch 'master' into geoipv2

Conflicts:
	api.php
readme