refs #330
refs #332
Merge branch 'dev' of github.com:projestimate/projestimate into dev