refs #380, refs #437
Merge branch 'dev' of github.com:projestimate/projestimate into dev