Issues when editing users refs  #538
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev