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