refs #650, #581
Merge branch 'dev' of https://github.com/projestimate/projestimate into dev