Advance User Find Use: refs  #569
Merge branch 'dev' of github.com:projestimate/projestimate into dev