updates estimate
updates console code to update all users on server
Merge branch 'master' into ws2013

* master:
  updates console code to update all users on server
updates console code to update all users on server
Merge branch 'master' into ws2013

* master:
  updates console code to update all users on server