refs #372, refs #369
Merge branch 'dev' of github.com:projestimate/projestimate into dev
refs #372, refs #369