refs #383 -resolve rest of defect
Merge branch 'dev' of github.com:projestimate/projestimate into dev