Merge branch 'master' into geoip
Merge branch 'geoip' of https://github.com/dkran/pixel into geoip
added trust proxy for nginx