refs #370,  #371
Merge branch 'dev' of github.com:projestimate/projestimate into dev
refs #381
refs #381