Readd current location on map refresh
Make sure replies are sent via every call to the server
Merge branch 'dev'