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