reverting
Fixed server proxy port configuration on startup issue
Merge branch 'master' of github.com:getlantern/lantern