http update
HttpConnectionManager: update location on server using GET or POST
Fixed merge conflicts in HttpConnectionManager.java